Merge branch 'AI3263' into 'master'

Ai3263: Fixed reordering of forms submissions See merge request !294

Merge branch 'AI3263' into 'master'
Ai3263: Fixed reordering of forms submissions See merge request !294
Antonio Terceiro
2 parents 94c1d5ec 3512ab2f
Showing 7 changed files with 51 additions and 11 deletions Show diff stats
plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb
plugins/custom_forms/db/migrate/20140807042217_fill_in_author_name_on_submission.rb
plugins/custom_forms/lib/custom_forms_plugin/submission.rb
plugins/custom_forms/public/order.js
plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
plugins/custom_forms/test/unit/custom_forms_plugin/submission_test.rb
plugins/custom_forms/views/custom_forms_plugin_myprofile/submissions.html.erb
@@ -65,10 +65,8 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
   def submissions
     @form = CustomFormsPlugin::Form.find(params[:id])
-    @submissions = @form.submissions
-
-    @sort_by = params[:sort_by]
-    @submissions = @submissions.sort_by { |s| s.profile.present? ? s.profile.name : s.author_name } if @sort_by == 'author'
+    @sort_by = params[:sort_by] == 'author_name' ? 'author_name' : 'created_at'
+    @submissions = @form.submissions.order(@sort_by)
     respond_to do |format|
       format.html
@@ -0,0 +1,19 @@
+class FillInAuthorNameOnSubmission < ActiveRecord::Migration
+  def up
+    CustomFormsPlugin::Submission.find_each do |submission|
+      unless submission.profile.nil?
+        submission.author_name = submission.profile.name
+        submission.save
+      end
+    end
+  end
+
+  def down
+    CustomFormsPlugin::Submission.find_each do |submission|
+      unless submission.profile.nil?
+        submission.author_name = nil
+        submission.save
+      end
+    end
+  end
+end
@@ -21,6 +21,12 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
     end
   end
+  before_create do |submission|
+    if submission.profile
+      submission.author_name = profile.name
+    end
+  end
+
   def build_answers submission
     self.form.fields.each do |field|
       next unless value = submission[field.id.to_s]
@@ -52,4 +58,3 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   end
 end
-
@@ -0,0 +1,5 @@
+jQuery("select.filter").change(function(){
+  var filter = jQuery(this).find("option:selected").val();
+  var attribute = jQuery(this).attr('name');
+  redirect_to('?' + attribute + '=' + filter);
+});
@@ -220,7 +220,7 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_not_nil assigns(:sort_by)
     assert_select 'table.action-table', /Author\W*Time\W*john[\W\dh]*bob[\W\dh]*/
-    get :submissions, :profile => profile.identifier, :id => form.id, :sort_by => 'author'
+    get :submissions, :profile => profile.identifier, :id => form.id, :sort_by => 'author_name'
     assert_not_nil assigns(:sort_by)
     assert_select 'table.action-table', /Author\W*Time\W*bob[\W\dh]*john[\W\dh]*/
   end
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 class CustomFormsPlugin::SubmissionTest < ActiveSupport::TestCase
+  def setup
+    @profile = fast_create(Profile)
+  end
+  attr_reader :profile
+
   should 'validates presence of form' do
     submission = CustomFormsPlugin::Submission.new
     submission.valid?
     assert submission.errors.include?(:form)
-    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
     submission.form = form
     submission.valid?
     assert !submission.errors.include?(:form)
   end
   should 'belong to a profile' do
-    profile = fast_create(Profile)
     submission = CustomFormsPlugin::Submission.new
     submission.profile = profile
     assert_equal profile, submission.profile
@@ -33,14 +37,21 @@ class CustomFormsPlugin::SubmissionTest &lt; ActiveSupport::TestCase
   end
   should 'have answers' do
-    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
     field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
-    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => profile)
     a1 = submission.answers.create!(:field => field, :submission => submission)
     a2 = submission.answers.create!(:field => field, :submission => submission)
     assert_includes submission.answers, a1
     assert_includes submission.answers, a2
   end
+
+  should 'store profile name as author' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
+    submission = CustomFormsPlugin::Submission.create(:form => form, :profile => profile)
+
+    assert_equal profile.name, submission.author_name
+  end
 end
@@ -10,7 +10,7 @@
     <%= link_to '[CSV]', :format => 'csv' %>
   </p>
   <p>
-    <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['time', _('Time')], ['author', _('Author')]], :onchange => 'document.location.href = "?sort_by="+this.value') %>
+    <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['created_at', _('Time')], ['author_name', _('Author')]], :class => 'filter') %>
   </p>
   <table class="action-table">
     <tr>
@@ -30,3 +30,5 @@
 <% button_bar do %>
   <%= button :back, _('Back to forms'), :action => 'index' %>
 <% end %>
+
+<%= javascript_include_tag '../plugins/custom_forms/order' %>
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+class FillInAuthorNameOnSubmission < ActiveRecord::Migration
	2	+ def up
	3	+ CustomFormsPlugin::Submission.find_each do \|submission\|
	4	+ unless submission.profile.nil?
	5	+ submission.author_name = submission.profile.name
	6	+ submission.save
	7	+ end
	8	+ end
	9	+ end
	10	+
	11	+ def down
	12	+ CustomFormsPlugin::Submission.find_each do \|submission\|
	13	+ unless submission.profile.nil?
	14	+ submission.author_name = nil
	15	+ submission.save
	16	+ end
	17	+ end
	18	+ end
	19	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+jQuery("select.filter").change(function(){
	2	+ var filter = jQuery(this).find("option:selected").val();
	3	+ var attribute = jQuery(this).attr('name');
	4	+ redirect_to('?' + attribute + '=' + filter);
	5	+});
	@@ -220,7 +220,7 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase		@@ -220,7 +220,7 @@ class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
220	assert_not_nil assigns(:sort_by)	220	assert_not_nil assigns(:sort_by)
221	assert_select 'table.action-table', /Author\WTime\Wjohn[\W\dh]bob[\W\dh]/	221	assert_select 'table.action-table', /Author\WTime\Wjohn[\W\dh]bob[\W\dh]/
222		222
223	- get :submissions, :profile => profile.identifier, :id => form.id, :sort_by => 'author'	223	+ get :submissions, :profile => profile.identifier, :id => form.id, :sort_by => 'author_name'
224	assert_not_nil assigns(:sort_by)	224	assert_not_nil assigns(:sort_by)
225	assert_select 'table.action-table', /Author\WTime\Wbob[\W\dh]john[\W\dh]/	225	assert_select 'table.action-table', /Author\WTime\Wbob[\W\dh]john[\W\dh]/
226	end	226	end