Makes it possible for the admin to see pending submissions

Larissa Reis
1 parent 8d3bc892
Showing 4 changed files with 48 additions and 2 deletions Show diff stats
plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb
plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb
plugins/custom_forms/views/custom_forms_plugin_myprofile/pending.html.erb
@@ -93,6 +93,14 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
     @form = @submission.form
   end
+  def pending
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    @pendings = CustomFormsPlugin::AdmissionSurvey.from(@form.profile).pending.select {|task| task.form_id == @form.id}.map {|a| {:profile => a.target, :time => a.created_at} }
+
+    @sort_by = params[:sort_by]
+    @pendings = @pendings.sort_by { |s| s[:profile].name } if @sort_by == 'user'
+  end
+
   private
   def normalize_positions(form)
@@ -216,5 +216,14 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_not_nil assigns(:sort_by)
     assert_select 'table.action-table', /Author\W*Time\W*bob[\W\dh]*john[\W\dh]*/
   end
-end
+  should 'list pending submissions for a form' do
+    person = fast_create(Person)
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :for_admission => true)
+    task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
+
+    get :pending, :profile => profile.identifier, :id => form.id
+
+    assert_tag :td, :content => person.name
+  end
+end
@@ -17,7 +17,9 @@
       <td><%= access_text(form) %></td>
       <td class="actions">
         <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => form.id %>
-        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :id => form.id}, :confirm => _('Are you sure you want to remove this form?') %></td>
+        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :id => form.id}, :confirm => _('Are you sure you want to remove this form?') %>
+        <%= button_without_text :search, _('Pending'), :action => 'pending', :id => form.id if form.for_admission %>
+      </td>
     </tr>
   <% end %>
   <tr id="new-item">
@@ -0,0 +1,27 @@
+<% self.extend CustomFormsPlugin::Helper %>
+
+<h1><%= _('Pending submissions for %s') % @form.name %></h1>
+
+<% if @pendings.empty? %>
+  <%= _('There are no pending submissions for this form.') %>
+<% else %>
+  <p>
+    <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['time', _('Time')], ['user', _('User')]], :onchange => 'document.location.href = "?sort_by="+this.value') %>
+  </p>
+  <table class="action-table">
+    <tr>
+      <th style='width: 50%'><%= _('User') %></th>
+      <th style='width: 50%'><%= _('Time') %></th>
+    </tr>
+    <% @pendings.each do |pending| %>
+      <tr>
+        <td><%= link_to(pending[:profile].name, {:controller => :profile, :profile => pending[:profile].identifier}) %></td>
+        <td><%= time_format(pending[:time]) %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to forms'), :action => 'index' %>
+<% end %>
	@@ -93,6 +93,14 @@ class CustomFormsPluginMyprofileController < MyProfileController		@@ -93,6 +93,14 @@ class CustomFormsPluginMyprofileController < MyProfileController
93	@form = @submission.form	93	@form = @submission.form
94	end	94	end
95		95
		96	+ def pending
		97	+ @form = CustomFormsPlugin::Form.find(params[:id])
		98	+ @pendings = CustomFormsPlugin::AdmissionSurvey.from(@form.profile).pending.select {\|task\| task.form_id == @form.id}.map {\|a\| {:profile => a.target, :time => a.created_at} }
		99	+
		100	+ @sort_by = params[:sort_by]
		101	+ @pendings = @pendings.sort_by { \|s\| s[:profile].name } if @sort_by == 'user'
		102	+ end
		103	+
96	private	104	private
97		105
98	def normalize_positions(form)	106	def normalize_positions(form)
	@@ -216,5 +216,14 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase		@@ -216,5 +216,14 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
216	assert_not_nil assigns(:sort_by)	216	assert_not_nil assigns(:sort_by)
217	assert_select 'table.action-table', /Author\WTime\Wbob[\W\dh]john[\W\dh]/	217	assert_select 'table.action-table', /Author\WTime\Wbob[\W\dh]john[\W\dh]/
218	end	218	end
219	-end
220		219
		220	+ should 'list pending submissions for a form' do
		221	+ person = fast_create(Person)
		222	+ form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :for_admission => true)
		223	+ task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
		224	+
		225	+ get :pending, :profile => profile.identifier, :id => form.id
		226	+
		227	+ assert_tag :td, :content => person.name
		228	+ end
		229	+end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+<% self.extend CustomFormsPlugin::Helper %>
	2	+
	3	+<h1><%= _('Pending submissions for %s') % @form.name %></h1>
	4	+
	5	+<% if @pendings.empty? %>
	6	+ <%= _('There are no pending submissions for this form.') %>
	7	+<% else %>
	8	+ <p>
	9	+ <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['time', _('Time')], ['user', _('User')]], :onchange => 'document.location.href = "?sort_by="+this.value') %>
	10	+ </p>
	11	+ <table class="action-table">
	12	+ <tr>
	13	+ <th style='width: 50%'><%= _('User') %></th>
	14	+ <th style='width: 50%'><%= _('Time') %></th>
	15	+ </tr>
	16	+ <% @pendings.each do \|pending\| %>
	17	+ <tr>
	18	+ <td><%= link_to(pending[:profile].name, {:controller => :profile, :profile => pending[:profile].identifier}) %></td>
	19	+ <td><%= time_format(pending[:time]) %></td>
	20	+ </tr>
	21	+ <% end %>
	22	+ </table>
	23	+<% end %>
	24	+
	25	+<% button_bar do %>
	26	+ <%= button :back, _('Back to forms'), :action => 'index' %>
	27	+<% end %>