Commit d476d310738b697e493b74049757003d2ea0921a
1 parent
da9cae05
Exists in
master
and in
7 other branches
Fix specific views for proposal task
Showing
4 changed files
with
105 additions
and
161 deletions
Show diff stats
views/tasks/_task.html.erb
... | ... | @@ -1,70 +0,0 @@ |
1 | -<div class="task_box" id="task-<%= task.id %>"> | |
2 | - | |
3 | - <% if task.respond_to?(:proposal_source) %> | |
4 | - <div class="task-proposal-source"><b><%= _('Source') %>:</b> <%= task.proposal_source %></div> | |
5 | - <% end %> | |
6 | - <%= render :partial => 'task_icon', :locals => {:task => task} %> | |
7 | - | |
8 | - <% if !@view_only && profile.organization? && @responsible_candidates.present? %> | |
9 | - <div class="task_responsible"> | |
10 | - <span class="label"><%= _('Assign to:') %></span> | |
11 | - <span> | |
12 | - <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %> | |
13 | - <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %> | |
14 | - </span> | |
15 | - </div> | |
16 | - <% end %> | |
17 | - | |
18 | - <% if @view_only && task.responsible.present? %> | |
19 | - <div class="task_responsible"> | |
20 | - <span class="label"><%= _('Assigned to:') %></span> | |
21 | - <span class="value"><%= task.responsible.name %></span> | |
22 | - </div> | |
23 | - <% end %> | |
24 | - | |
25 | - <div class="task_decisions"> | |
26 | - <% unless @view_only %> | |
27 | - <%= | |
28 | - labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept', | |
29 | - :id => "decision-finish-#{task.id}", | |
30 | - :class => 'task_accept_radio', | |
31 | - :disabled => task.accept_disabled?, | |
32 | - :task_id => "#{task.id}") + | |
33 | - labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject', | |
34 | - :id => "decision-cancel-#{task.id}", | |
35 | - :class => 'task_reject_radio', | |
36 | - :disabled => task.reject_disabled?, | |
37 | - :task_id => "#{task.id}") + | |
38 | - labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip', | |
39 | - :id => "decision-skip-#{task.id}", | |
40 | - :class => 'task_skip_radio', | |
41 | - :disabled => task.skip_disabled?, | |
42 | - :task_id => "#{task.id}") | |
43 | - %> | |
44 | - <% end %> | |
45 | - </div><!-- class="task_decisions" --> | |
46 | - | |
47 | - <div class="task_date"><%= show_time(task.created_at) %></div> | |
48 | - | |
49 | - <%= render :partial => 'task_title', :locals => {:task => task} %> | |
50 | - | |
51 | - <div class="task_information"> | |
52 | - <%= task_information(task) %> | |
53 | - </div> | |
54 | - | |
55 | - <%= fields_for "tasks[#{task.id}][task]", task do |f| %> | |
56 | - <% if task.accept_details %> | |
57 | - <div id="on-accept-information-<%=task.id%>" style="display: none"> | |
58 | - <%= render :partial => partial_for_class(task.class, nil, :accept_details), :locals => {:task => task, :f => f} %> | |
59 | - </div> | |
60 | - <% end %> | |
61 | - | |
62 | - <% if task.reject_details %> | |
63 | - <div id="on-reject-information-<%=task.id%>" style="display: none"> | |
64 | - <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %> | |
65 | - </div> | |
66 | - <% end %> | |
67 | - | |
68 | - <% end %> | |
69 | - | |
70 | -</div><!-- class="task_box" --> |
views/tasks/processed.html.erb
... | ... | @@ -1,91 +0,0 @@ |
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 | - <% if item.respond_to?(:proposal_source) %> | |
44 | - <div class="task-proposal-source"><b><%= _('Source') %>:</b> <%= item.proposal_source %></div> | |
45 | - <% end %> | |
46 | - <div class="title"> | |
47 | - <%= task_information(item) %> | |
48 | - </div> | |
49 | - <div class="status"> | |
50 | - <%= _(Task::Status.names[item.status]) %> | |
51 | - </div> | |
52 | - <div class="dates"> | |
53 | - <span class="created"> | |
54 | - <span class="label"><%= _('Created:') %></span> | |
55 | - <span class="value"><%= show_date(item.created_at) %></span> | |
56 | - </span> | |
57 | - </div> | |
58 | - <% if item.proposal_evaluation.present? %> | |
59 | - <div class="closed-by"> | |
60 | - <span class="label"><%= _('Moderator') %>:</span> | |
61 | - <span class="value"><%= link_to(item.proposal_evaluation.evaluated_by.name, item.proposal_evaluation.evaluated_by.url) %></span> | |
62 | - — | |
63 | - <span class="processed"> | |
64 | - <span class="label"><%= _('Moderated at') %>:</span> | |
65 | - <span class="value"><%= show_time(item.proposal_evaluation.created_at) %></span> | |
66 | - </span> | |
67 | - </div> | |
68 | - <% end %> | |
69 | - <% if item.closed_by.present? %> | |
70 | - <div class="closed-by"> | |
71 | - <span class="label"><%= _('Evaluator') %>:</span> | |
72 | - <span class="value"><%= link_to(item.closed_by.name, item.closed_by.url) %></span> | |
73 | - — | |
74 | - <span class="processed"> | |
75 | - <span class="label"><%= _('Evaluated at') %>:</span> | |
76 | - <span class="value"><%= show_time(item.end_date) %></span> | |
77 | - </span> | |
78 | - </div> | |
79 | - <% end %> | |
80 | - </li> | |
81 | - <% end %> | |
82 | - </ul> | |
83 | - <%= pagination_links(@tasks)%> | |
84 | -<% end %> | |
85 | -</p> | |
86 | - | |
87 | -<% button_bar do %> | |
88 | - <%= button(:back, _('Back'), :action => 'index') %> | |
89 | -<% end %> | |
90 | - | |
91 | -</div> |
views/tasks/proposals_discussion_plugin/_proposal_task.html.erb
0 → 100644
... | ... | @@ -0,0 +1,68 @@ |
1 | +<div class="task_box" id="task-<%= task.id %>"> | |
2 | + | |
3 | + <div class="task-proposal-source"><b><%= _('Source') %>:</b> <%= task.proposal_source %></div> | |
4 | + <%= render :partial => 'task_icon', :locals => {:task => task} %> | |
5 | + | |
6 | + <% if !@view_only && profile.organization? && @responsible_candidates.present? %> | |
7 | + <div class="task_responsible"> | |
8 | + <span class="label"><%= _('Assign to:') %></span> | |
9 | + <span> | |
10 | + <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %> | |
11 | + <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %> | |
12 | + </span> | |
13 | + </div> | |
14 | + <% end %> | |
15 | + | |
16 | + <% if @view_only && task.responsible.present? %> | |
17 | + <div class="task_responsible"> | |
18 | + <span class="label"><%= _('Assigned to:') %></span> | |
19 | + <span class="value"><%= task.responsible.name %></span> | |
20 | + </div> | |
21 | + <% end %> | |
22 | + | |
23 | + <div class="task_decisions"> | |
24 | + <% unless @view_only %> | |
25 | + <%= | |
26 | + labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept', | |
27 | + :id => "decision-finish-#{task.id}", | |
28 | + :class => 'task_accept_radio', | |
29 | + :disabled => task.accept_disabled?, | |
30 | + :task_id => "#{task.id}") + | |
31 | + labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject', | |
32 | + :id => "decision-cancel-#{task.id}", | |
33 | + :class => 'task_reject_radio', | |
34 | + :disabled => task.reject_disabled?, | |
35 | + :task_id => "#{task.id}") + | |
36 | + labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip', | |
37 | + :id => "decision-skip-#{task.id}", | |
38 | + :class => 'task_skip_radio', | |
39 | + :disabled => task.skip_disabled?, | |
40 | + :task_id => "#{task.id}") | |
41 | + %> | |
42 | + <% end %> | |
43 | + </div><!-- class="task_decisions" --> | |
44 | + | |
45 | + <div class="task_date"><%= show_time(task.created_at) %></div> | |
46 | + | |
47 | + <%= render :partial => 'task_title', :locals => {:task => task} %> | |
48 | + | |
49 | + <div class="task_information"> | |
50 | + <%= task_information(task) %> | |
51 | + </div> | |
52 | + | |
53 | + <%= fields_for "tasks[#{task.id}][task]", task do |f| %> | |
54 | + <% if task.accept_details %> | |
55 | + <div id="on-accept-information-<%=task.id%>" style="display: none"> | |
56 | + <%= render :partial => partial_for_class(task.class, nil, :accept_details), :locals => {:task => task, :f => f} %> | |
57 | + </div> | |
58 | + <% end %> | |
59 | + | |
60 | + <% if task.reject_details %> | |
61 | + <div id="on-reject-information-<%=task.id%>" style="display: none"> | |
62 | + <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %> | |
63 | + </div> | |
64 | + <% end %> | |
65 | + | |
66 | + <% end %> | |
67 | + | |
68 | +</div><!-- class="task_box" --> | ... | ... |
views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb
0 → 100644
... | ... | @@ -0,0 +1,37 @@ |
1 | +<div class="task-proposal-source"> | |
2 | + <b><%= _('Source') %>:</b> <%= task.proposal_source %> | |
3 | +</div> | |
4 | +<div class="title"> | |
5 | + <%= task_information(task) %> | |
6 | +</div> | |
7 | +<div class="status"> | |
8 | + <%= _(Task::Status.names[task.status]) %> | |
9 | +</div> | |
10 | +<div class="dates"> | |
11 | + <span class="created"> | |
12 | + <span class="label"><%= _('Created:') %></span> | |
13 | + <span class="value"><%= show_date(task.created_at) %></span> | |
14 | + </span> | |
15 | +</div> | |
16 | +<% if task.proposal_evaluation.present? %> | |
17 | +<div class="closed-by"> | |
18 | + <span class="label"><%= _('Moderator') %>:</span> | |
19 | + <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span> | |
20 | + — | |
21 | + <span class="processed"> | |
22 | + <span class="label"><%= _('Moderated at') %>:</span> | |
23 | + <span class="value"><%= show_time(task.proposal_evaluation.created_at) %></span> | |
24 | + </span> | |
25 | +</div> | |
26 | +<% end %> | |
27 | +<% if task.closed_by.present? %> | |
28 | + <div class="closed-by"> | |
29 | + <span class="label"><%= _('Evaluator') %>:</span> | |
30 | + <span class="value"><%= link_to(task.closed_by.name, task.closed_by.url) %></span> | |
31 | + — | |
32 | + <span class="processed"> | |
33 | + <span class="label"><%= _('Evaluated at') %>:</span> | |
34 | + <span class="value"><%= show_time(task.end_date) %></span> | |
35 | + </span> | |
36 | + </div> | |
37 | +<% end %> | ... | ... |