Show different messages for expired forms

(ActionItem2969)

Show different messages for expired forms
(ActionItem2969)
Larissa Reis
1 parent bfc0d0ed
Showing 6 changed files with 54 additions and 6 deletions Show diff stats
plugins/custom_forms/lib/custom_forms_plugin/form.rb
plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb
plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb
plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb
po/pt/noosfero.po
@@ -43,6 +43,10 @@ class CustomFormsPlugin::Form &lt; Noosfero::Plugin::ActiveRecord
     (begining.present? && Time.now < begining) || (ending.present? && Time.now > ending)
   end
+  def will_open?
+    begining.present? && Time.now < begining
+  end
+
   def accessible_to(target)
     return true if access.nil? || target == profile
     return false if target.nil?
@@ -35,7 +35,23 @@ class CustomFormsPluginProfileControllerTest &lt; ActionController::TestCase
     get :show, :profile => profile.identifier, :id => form.id
-    assert_tag :tag => 'h2', :content => 'Sorry, you can\'t fill this form right now'
     assert_tag :tag => 'input', :attributes => {:disabled => 'disabled'}
   end
+
+  should 'show expired message' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)
+    form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")
+
+    get :show, :profile => profile.identifier, :id => form.id
+
+    assert_tag :tag => 'h2', :content => 'Sorry, you can\'t fill this form yet'
+
+    form.begining = Time.now - 2.days
+    form.ending = Time.now - 1.days
+    form.save
+
+    get :show, :profile => profile.identifier, :id => form.id
+
+    assert_tag :tag => 'h2', :content => 'Sorry, you can\'t fill this form anymore'
+  end
 end
@@ -89,6 +89,22 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
     assert !form.expired?
   end
+  should 'define if form will still open' do
+    form = CustomFormsPlugin::Form.new
+    assert !form.will_open?
+
+    form.begining = Time.now + 1.day
+    assert form.will_open?
+
+    form.begining = Time.now - 1.day
+    assert !form.will_open?
+
+    form.begining = Time.now - 2.day
+    form.ending = Time.now - 1.day
+    assert form.expired?
+    assert !form.will_open?
+  end
+
   should 'validates format of access' do
     form = CustomFormsPlugin::Form.new
     form.valid?
@@ -3,7 +3,11 @@
 <% if @submission.id.nil? %>
   <% if @form.expired? %>
-    <h2><%= _('Sorry, you can\'t fill this form right now') %></h2>
+    <% if @form.will_open? %>
+      <h2><%= _('Sorry, you can\'t fill this form yet') %></h2>
+    <% else %>
+      <h2><%= _('Sorry, you can\'t fill this form anymore') %></h2>
+    <% end %>
   <% end %>
   <%= error_messages_for :submission %>
@@ -4,7 +4,11 @@
 <h2><%= @form.name %></h2>
 <p><%= @form.description %></p>
 <% if @form.expired? %>
-  <h3><%= _('Sorry, you can\'t fill this form right now') %></h3>
+  <% if @form.will_open? %>
+    <h3><%= _('Sorry, you can\'t fill this form yet') %></h3>
+  <% else %>
+    <h3><%= _('Sorry, you can\'t fill this form anymore') %></h3>
+  <% end %>
 <% end %>
 <% f.fields_for :submission do |fi| %>
@@ -11497,9 +11497,13 @@ msgstr &quot;Nome do autor&quot;
 msgid "Author email"
 msgstr "Email do autor"
-#: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:5
-msgid "Sorry, you can't fill this form right now"
-msgstr "Desculpe, você não pode preencher esse formulário no momento"
+#: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:7
+msgid "Sorry, you can't fill this form yet"
+msgstr "Desculpe, você não pode preencher esse formulário ainda"
+
+#: plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb:9
+msgid "Sorry, you can't fill this form anymore"
+msgstr "Desculpe, você não pode mais preencher esse formulário"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_empty_field.html.erb:8
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_field.html.erb:10
	@@ -35,7 +35,23 @@ class CustomFormsPluginProfileControllerTest < ActionController::TestCase		@@ -35,7 +35,23 @@ class CustomFormsPluginProfileControllerTest < ActionController::TestCase
35		35
36	get :show, :profile => profile.identifier, :id => form.id	36	get :show, :profile => profile.identifier, :id => form.id
37		37
38	- assert_tag :tag => 'h2', :content => 'Sorry, you can\'t fill this form right now'
39	assert_tag :tag => 'input', :attributes => {:disabled => 'disabled'}	38	assert_tag :tag => 'input', :attributes => {:disabled => 'disabled'}
40	end	39	end
		40	+
		41	+ should 'show expired message' do
		42	+ form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software', :begining => Time.now + 1.day)
		43	+ form.fields << CustomFormsPlugin::TextField.create(:name => 'Field Name', :form => form, :default_value => "First Field")
		44	+
		45	+ get :show, :profile => profile.identifier, :id => form.id
		46	+
		47	+ assert_tag :tag => 'h2', :content => 'Sorry, you can\'t fill this form yet'
		48	+
		49	+ form.begining = Time.now - 2.days
		50	+ form.ending = Time.now - 1.days
		51	+ form.save
		52	+
		53	+ get :show, :profile => profile.identifier, :id => form.id
		54	+
		55	+ assert_tag :tag => 'h2', :content => 'Sorry, you can\'t fill this form anymore'
		56	+ end
41	end	57	end
	@@ -89,6 +89,22 @@ class CustomFormsPlugin::FormTest < ActiveSupport::TestCase		@@ -89,6 +89,22 @@ class CustomFormsPlugin::FormTest < ActiveSupport::TestCase
89	assert !form.expired?	89	assert !form.expired?
90	end	90	end
91		91
		92	+ should 'define if form will still open' do
		93	+ form = CustomFormsPlugin::Form.new
		94	+ assert !form.will_open?
		95	+
		96	+ form.begining = Time.now + 1.day
		97	+ assert form.will_open?
		98	+
		99	+ form.begining = Time.now - 1.day
		100	+ assert !form.will_open?
		101	+
		102	+ form.begining = Time.now - 2.day
		103	+ form.ending = Time.now - 1.day
		104	+ assert form.expired?
		105	+ assert !form.will_open?
		106	+ end
		107	+
92	should 'validates format of access' do	108	should 'validates format of access' do
93	form = CustomFormsPlugin::Form.new	109	form = CustomFormsPlugin::Form.new
94	form.valid?	110	form.valid?