Merge branch 'master' into custom-forms

Conflicts: plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb po/pt/noosfero.po

Merge branch 'master' into custom-forms
Conflicts: plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb po/pt/noosfero.po
Rodrigo Souto
2 parents 540c6070 45a88ecf
Showing 49 changed files with 1212 additions and 480 deletions Show diff stats
plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb
plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
plugins/custom_forms/db/migrate/20130823134700_create_custom_forms_plugin_alternatives.rb
plugins/custom_forms/db/migrate/20130823135600_add_select_field_type_to_custom_forms_plugin_fields.rb
plugins/custom_forms/db/migrate/20130823151900_associate_fields_to_alternatives.rb
plugins/custom_forms/db/migrate/20131002155900_update_select_field_type_in_custom_forms_plugin_fields.rb
plugins/custom_forms/db/migrate/20131007120600_add_selected_by_default_to_custom_forms_plugin_alternatives.rb
plugins/custom_forms/db/migrate/20131107050913_add_position_to_field_and_alternatives.rb
plugins/custom_forms/db/migrate/20131107125327_add_admission_to_form.rb
plugins/custom_forms/lib/custom_forms_plugin/admission_survey.rb
plugins/custom_forms/lib/custom_forms_plugin/alternative.rb
plugins/custom_forms/lib/custom_forms_plugin/answer.rb
plugins/custom_forms/lib/custom_forms_plugin/field.rb
plugins/custom_forms/lib/custom_forms_plugin/form.rb
plugins/custom_forms/lib/custom_forms_plugin/helper.rb
plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb
plugins/custom_forms/lib/custom_forms_plugin/select_field.rb
plugins/custom_forms/lib/custom_forms_plugin/submission.rb
plugins/custom_forms/lib/ext/role_assignment_trigger.rb
plugins/custom_forms/public/field.js
-class CustomFormsPluginMyprofileController < MyProfileController
+require 'csv'
+class CustomFormsPluginMyprofileController < MyProfileController
   protect 'post_content', :profile
+
   def index
     @forms = CustomFormsPlugin::Form.from(profile)
   end
+  def new
+    @form = CustomFormsPlugin::Form.new
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
   def create
-    @form = CustomFormsPlugin::Form.new(:profile => profile)
-    @fields = []
-    @empty_field = CustomFormsPlugin::Field.new
-    if request.post?
-      begin
-        @form.update_attributes!(params[:form])
-        params[:fields] = format_kind(params[:fields])
-        params[:fields] = format_choices(params[:fields])
-        params[:fields] = set_form_id(params[:fields], @form.id)
-        create_fields(new_fields(params))
-        session['notice'] = _('Form created')
-        redirect_to :action => 'index'
-      rescue Exception => exception
-        logger.error(exception.to_s)
-        session['notice'] = _('Form could not be created')
+    params[:form][:profile_id] = profile.id
+    @form = CustomFormsPlugin::Form.new(params[:form])
+
+    normalize_positions(@form)
+
+    respond_to do |format|
+      if @form.save
+        flash[:notice] = _("Custom form #{@form.name} was successfully created.")
+        format.html { redirect_to(:action=>'index') }
+      else
+        format.html { render :action => 'new' }
       end
     end
   end
   def edit
     @form = CustomFormsPlugin::Form.find(params[:id])
-    @fields = @form.fields
-    @empty_field = CustomFormsPlugin::TextField.new
-    if request.post?
-      begin
-        @form.update_attributes!(params[:form])
-        params[:fields] = format_kind(params[:fields])
-        params[:fields] = format_choices(params[:fields])
-        remove_fields(params, @form)
-        create_fields(new_fields(params))
-        update_fields(edited_fields(params))
-        session['notice'] = _('Form updated')
-        redirect_to :action => 'index'
-      rescue Exception => exception
-        logger.error(exception.to_s)
+  end
+
+  def update
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    @form.attributes = params[:form]
+
+    normalize_positions(@form)
+
+    respond_to do |format|
+      if @form.save
+        flash[:notice] = _("Custom form #{@form.name} was successfully updated.")
+        format.html { redirect_to(:action=>'index') }
+      else
         session['notice'] = _('Form could not be updated')
+        format.html { render :action => 'edit' }
       end
     end
   end
@@ -60,6 +66,26 @@ 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'
+
+    respond_to do |format|
+      format.html
+      format.csv do
+        # CSV contains form fields, timestamp, user name and user email
+        columns = @form.fields.count + 3
+        csv_content = CSV.generate_line(['Timestamp', 'Name', 'Email'] + @form.fields.map(&:name)) + "\n"
+        @submissions.each do |s|
+          fields = [s.updated_at.strftime('%Y/%m/%d %T %Z'), s.profile.present? ? s.profile.name : s.author_name, s.profile.present? ? s.profile.email : s.author_email]
+          @form.fields.each do |f|
+            fields << s.answers.select{|a| a.field == f}.map{|answer| answer.to_s}
+          end
+          CSV.generate_row(fields, columns, csv_content)
+        end
+        send_data csv_content, :type => 'text/csv', :filename => "#{@form.name}.csv"
+      end
+    end
   end
   def show_submission
@@ -67,82 +93,29 @@ class CustomFormsPluginMyprofileController &lt; MyProfileController
     @form = @submission.form
   end
-  private
-
-  def new_fields(params)
-    keys = params[:fields].keys.sort{|a, b| a.to_i <=> b.to_i}
-    result = keys.map { |id| (hash = params[:fields][id]).has_key?(:real_id) ? nil : hash}.compact
-    result.delete_if {|field| field[:name].blank?}
-    result
-  end
-
-  def edited_fields(params)
-    params[:fields].map {|id, hash| hash.has_key?(:real_id) ? hash : nil}.compact
-  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} }
-  def create_fields(fields)
-    fields.each do |field|
-      case field[:type]
-      when 'text_field'
-        CustomFormsPlugin::TextField.create!(field)
-      when 'select_field'
-        CustomFormsPlugin::SelectField.create!(field)
-      else
-        CustomFormsPlugin::Field.create!(field)
-      end
-    end
+    @sort_by = params[:sort_by]
+    @pendings = @pendings.sort_by { |s| s[:profile].name } if @sort_by == 'user'
   end
-  def update_fields(fields)
-    fields.each do |field_attrs|
-      field = CustomFormsPlugin::Field.find(field_attrs.delete(:real_id))
-      field.attributes = field_attrs
-      field.save! if field.changed?
-    end
-  end
+  private
-  def format_kind(fields)
-    fields.each do |id, field|
-      next if field[:kind].blank?
-      kind = field.delete(:kind)
-      case kind
-      when 'radio'
-        field[:list] = false
-        field[:multiple] = false
-      when 'check_box'
-        field[:list] = false
-        field[:multiple] = true
-      when 'select'
-        field[:list] = true
-        field[:multiple] = false
-      when 'multiple_select'
-        field[:list] = true
-        field[:multiple] = true
-      end
+  def normalize_positions(form)
+    counter = 0
+    form.fields.sort_by{ |f| f.position.to_i }.each do |field|
+      field.position = counter
+      counter += 1
     end
-    fields
-  end
-
-  def format_choices(fields)
-    fields.each do |id, field|
-      next if !field.has_key?(:choices)
-      field[:choices] = field[:choices].map {|key, value| value}.inject({}) do |result, choice| 
-        hash = (choice[:name].blank? || choice[:value].blank?) ? {} : {choice[:name] => choice[:value]}
-        result.merge!(hash)
+    form.fields.each do |field|
+      counter = 0
+      field.alternatives.sort_by{ |alt| alt.position.to_i }.each do |alt|
+        alt.position = counter
+        counter += 1
       end
     end
-    fields
   end
-  def remove_fields(params, form)
-    present_fields = params[:fields].map{|id, value| value}.collect {|field| field[:real_id]}.compact
-    form.fields.each {|field| field.destroy if !present_fields.include?(field.id.to_s) }
-  end
-
-  def set_form_id(fields, form_id)
-    fields.each do |id, field|
-      field[:form_id] = form_id
-    end
-    fields
-  end
 end
 class CustomFormsPluginProfileController < ProfileController
-
   before_filter :has_access, :show
   def show
+    extend(CustomFormsPlugin::Helper)
+
     @form = CustomFormsPlugin::Form.find(params[:id])
     if user
       @submission ||= CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
@@ -10,22 +11,34 @@ class CustomFormsPluginProfileController &lt; ProfileController
     else
       @submission ||= CustomFormsPlugin::Submission.new(:form_id => @form.id)
     end
+
+    # build the answers
+    @submission.answers.push(*(answers = build_answers(params[:submission], @form))) if params[:submission]
+
     if request.post?
       begin
-        extend(CustomFormsPlugin::Helper)
-        answers = build_answers(params[:submission], @form)
+        raise 'Submission already present!' if user.present? && CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
+        raise 'Form expired!' if @form.expired?
+
+        # @submission.answers for some reason has the same answer twice
         failed_answers = answers.select {|answer| !answer.valid? }
+
         if failed_answers.empty?
-          if !user
-            @submission.author_name = params[:author_name]
-            @submission.author_email = params[:author_email]
+          # Save the submission
+          ActiveRecord::Base.transaction do
+            if !user
+              @submission.author_name = params[:author_name]
+              @submission.author_email = params[:author_email]
+            end
+            @submission.save!
           end
-          @submission.save!
-          answers.map {|answer| answer.submission = @submission; answer.save!}
         else
-          @submission.valid?
+          @submission.errors.clear
           failed_answers.each do |answer|
-            @submission.errors.add(answer.field.name.to_sym, answer.errors[answer.field.slug.to_sym])
+            answer.valid?
+            answer.errors.each do |attribute, msg|
+              @submission.errors.add(answer.field.id.to_s.to_sym, msg)
+            end
           end
           raise 'Submission failed: answers not valid'
         end
@@ -0,0 +1,12 @@
+class CreateCustomFormsPluginAlternatives < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_alternatives do |t|
+      t.string :label
+      t.references :field
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_alternatives
+  end
+end
@@ -0,0 +1,32 @@
+class AddSelectFieldTypeToCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    change_table :custom_forms_plugin_fields do |t|
+      t.string :select_field_type
+    end
+
+    update("UPDATE custom_forms_plugin_fields SET select_field_type='radio' WHERE list IS FALSE AND multiple IS FALSE")
+    update("UPDATE custom_forms_plugin_fields SET select_field_type='check_box' WHERE list IS FALSE AND multiple IS TRUE")
+    update("UPDATE custom_forms_plugin_fields SET select_field_type='select' WHERE list IS TRUE AND multiple IS FALSE")
+    update("UPDATE custom_forms_plugin_fields SET select_field_type='multiple_select' WHERE list IS TRUE AND multiple IS TRUE")
+
+    change_table :custom_forms_plugin_fields do |t|
+      t.remove :multiple, :list
+    end
+  end
+
+  def self.down
+    change_table :custom_forms_plugin_fields do |t|
+      t.boolean :multiple
+      t.boolean :list
+    end
+
+    update("UPDATE custom_forms_plugin_fields SET list=TRUE, multiple=FALSE WHERE select_field_type='radio'")
+    update("UPDATE custom_forms_plugin_fields SET list=FALSE, multiople=TRUE WHERE select_field_type='check_box'")
+    update("UPDATE custom_forms_plugin_fields SET list=TRUE, multiple=FALSE WHERE select_field_type='select'")
+    update("UPDATE custom_forms_plugin_fields SET list=TRUE, multiple=TRUE WHERE select_field_type='multiple_select'")
+
+    change_table :custom_forms_plugin_fields do |t|
+      t.remove :select_fields_type
+    end
+  end
+end
@@ -0,0 +1,37 @@
+class AssociateFieldsToAlternatives < ActiveRecord::Migration
+  class CustomFormsPlugin::Field < ActiveRecord::Base
+    set_table_name :custom_forms_plugin_fields
+    has_many :alternatives, :class_name => 'CustomFormsPlugin::Alternative'
+    serialize :choices, Hash
+  end
+
+  def self.up
+    CustomFormsPlugin::Field.reset_column_information
+
+    CustomFormsPlugin::Field.find_each do |f|
+      f.choices.each do |key, value|
+        CustomFormsPlugin::Alternative.create!(:label => key, :field_id => f.id)
+      end
+    end
+
+    CustomFormsPlugin::Answer.find_each do |answer|
+      labels = []
+      answer.value.split(',').each do |value|
+        labels << answer.field.choices.invert[value]
+      end
+      labels.compact!
+      if labels.present?
+        answer.value = answer.field.alternatives.where('label IN (?)', labels).map(&:id).join(',')
+        answer.save!
+      end
+    end
+
+    change_table :custom_forms_plugin_fields do |t|
+      t.remove :choices
+    end
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
@@ -0,0 +1,9 @@
+class UpdateSelectFieldTypeInCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    change_column :custom_forms_plugin_fields, :select_field_type, :string, :null => false, :default => 'radio'
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
@@ -0,0 +1,14 @@
+class AddSelectedByDefaultToCustomFormsPluginAlternatives < ActiveRecord::Migration
+  def self.up
+    add_column :custom_forms_plugin_alternatives, :selected_by_default, :boolean, :null => false, :default => false
+    CustomFormsPlugin::Field.find_each do |f|
+      f.alternatives.each do |a|
+        a.update_attribute(:selected_by_default, true) if a.label == f.default_value
+      end
+    end
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
@@ -0,0 +1,17 @@
+class AddPositionToFieldAndAlternatives < ActiveRecord::Migration
+  def self.up
+    change_table :custom_forms_plugin_alternatives do |t|
+      t.integer :position, :default => 0
+    end
+
+    update("UPDATE custom_forms_plugin_fields SET position=id")
+    update("UPDATE custom_forms_plugin_alternatives SET position=id")
+
+  end
+
+  def self.down
+    change_table :custom_forms_plugin_alternatives do |t|
+      t.remove :position
+    end
+  end
+end
@@ -0,0 +1,18 @@
+class AddAdmissionToForm < ActiveRecord::Migration
+  def self.up
+    change_table :custom_forms_plugin_forms do |t|
+      t.boolean :for_admission, :default => false
+    end 
+
+    CustomFormsPlugin::Form.find_each do |f|
+      f.for_admission = false
+      f.save!
+    end
+  end
+
+  def self.down
+    change_table :custom_forms_plugin_forms do |t|
+      t.remove :for_admission
+    end 
+  end
+end
@@ -0,0 +1,24 @@
+class CustomFormsPlugin::AdmissionSurvey < CustomFormsPlugin::MembershipSurvey
+
+  def perform
+    super
+    requestor.add_member(target)
+  end
+
+  def title
+    _("Admission survey")
+  end
+
+  def information
+    {:message => _('%{requestor} wants you to fill in some information before joining.')}
+  end
+
+  def target_notification_message
+    _('Before joining %{requestor}, the administrators of this organization
+      wants you to fill in some further information.') % {:requestor => requestor.name}
+  end
+
+  def target_notification_description
+    _('%{requestor} wants you to fill in some further information.') % {:requestor => requestor.name}
+  end
+end
@@ -0,0 +1,8 @@
+class CustomFormsPlugin::Alternative < ActiveRecord::Base
+  set_table_name :custom_forms_plugin_alternatives
+
+  validates_presence_of :label
+
+  belongs_to :field, :class_name => 'CustomFormsPlugin::Field'
+end
+
@@ -7,8 +7,14 @@ class CustomFormsPlugin::Answer &lt; Noosfero::Plugin::ActiveRecord
   def value_mandatory
     if field.mandatory && value.blank?
-      errors.add(field.slug.to_sym, _("is mandatory.").fix_i18n)
+      errors.add(:value, _("is mandatory.").fix_i18n)
     end
   end
+
+  def to_s
+    return value if value.blank? || field.alternatives.blank?
+    selected = value.split(',')
+    field.alternatives.select {|alt| selected.include? alt.id.to_s }.map(&:label).join(';')
+  end
 end
 class CustomFormsPlugin::Field < ActiveRecord::Base
   set_table_name :custom_forms_plugin_fields
-  validates_presence_of :form, :name
-  validates_uniqueness_of :slug, :scope => :form_id
+  validates_presence_of :name
   belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
   has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
-  serialize :choices, Hash
+  has_many :alternatives, :order => 'position', :class_name => 'CustomFormsPlugin::Alternative'
+  accepts_nested_attributes_for :alternatives, :allow_destroy => true
+  #FIXME This validation should be in the subclass, but since we are using Single Table
+  # Inheritance we are instantiating a Field object with the type as a param. So the validation
+  # had to go here or rails would skip it.
+  validates_length_of :alternatives, :minimum => 1, :message => 'can\'t be empty', :if => Proc.new { |f| f.type == 'CustomFormsPlugin::SelectField' }
   before_validation do |field|
     field.slug = field.name.to_slug if field.name.present?
   end
-  before_create do |field|
-    if field.form.fields.exists?
-      field.position = field.form.fields.order(:position).last.position + 1
-    end
-  end
+  private
-  def position
-    self[:position] || 0
+  def attributes_protected_by_default
+    super - [self.class.inheritance_column]
   end
+
 end
 class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
   belongs_to :profile
-  has_many :fields, :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy, :order => 'position'
+  has_many :fields, :order => 'position', :class_name => 'CustomFormsPlugin::Field', :dependent => :destroy
+  accepts_nested_attributes_for :fields, :allow_destroy => true
+
   has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
   serialize :access
   validates_presence_of :profile, :name
   validates_uniqueness_of :slug, :scope => :profile_id
+  validate :period_range, :if => Proc.new { |f| f.begining.present? && f.ending.present? }
   validate :access_format
   before_validation do |form|
@@ -15,10 +18,16 @@ class CustomFormsPlugin::Form &lt; Noosfero::Plugin::ActiveRecord
     form.access = nil if form.access.blank?
   end
+  after_destroy do |form|
+    tasks = CustomFormsPlugin::MembershipSurvey.from(form.profile).opened.select { |t| t.form_id == form.id }
+    tasks.each {|task| task.cancel}
+  end
+
   named_scope :from, lambda {|profile| {:conditions => {:profile_id => profile.id}}}
-  named_scope :on_memberships, {:conditions => {:on_membership => true}}
+  named_scope :on_memberships, {:conditions => {:on_membership => true, :for_admission => false}}
+  named_scope :for_admissions, {:conditions => {:for_admission => true}}
 =begin
-  named_scope :accessible_to lambda do |profile| 
+  named_scope :accessible_to lambda do |profile|
     #TODO should verify is profile is associated with the form owner
     profile_associated = ???
     {:conditions => ["
@@ -34,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?
@@ -58,7 +71,7 @@ class CustomFormsPlugin::Form &lt; Noosfero::Plugin::ActiveRecord
       elsif access.kind_of?(Array)
         access.each do |value|
           if !value.kind_of?(Integer) || !Profile.exists?(value)
-            errors.add(:access, _('There is no profile with the provided id.')) 
+            errors.add(:access, _('There is no profile with the provided id.'))
             break
           end
         end
@@ -67,4 +80,8 @@ class CustomFormsPlugin::Form &lt; Noosfero::Plugin::ActiveRecord
       end
     end
   end
+
+  def period_range
+    errors.add(:base, _('The time range selected is invalid.')) if ending < begining 
+  end
 end
 module CustomFormsPlugin::Helper
+  def html_for_field(builder, association, klass)
+    new_object = klass.new
+    builder.fields_for(association, new_object, :child_index => "new_#{association}") do |f|
+      render(partial_for_class(klass), :f => f)
+    end
+  end
+
   def access_text(form)
     return _('Public') if form.access.nil?
     return _('Logged users') if form.access == 'logged'
     if form.access == 'associated'
-      return _('Members') if form.profile.organization? 
+      return _('Members') if form.profile.organization?
       return _('Friends') if form.profile.person?
     end
     return _('Custom')
@@ -48,8 +55,8 @@ module CustomFormsPlugin::Helper
   def type_to_label(type)
     map = {
-      'text_field' => _('Text'),
-      'select_field' => _('Select')
+      'text_field' => _('Text field'),
+      'select_field' => _('Select field')
     }
     map[type_for_options(type)]
   end
@@ -61,52 +68,61 @@ module CustomFormsPlugin::Helper
   def display_custom_field(field, submission, form)
     answer = submission.answers.select{|answer| answer.field == field}.first
     field_tag = send("display_#{type_for_options(field.class)}",field, answer, form)
-    if field.mandatory? && !radio_button?(field) && !check_box?(field) && submission.id.nil?
+    if field.mandatory? && submission.id.nil?
       required(labelled_form_field(field.name, field_tag))
-    else 
+    else
       labelled_form_field(field.name, field_tag)
     end
   end
+  def display_disabled?(field, answer)
+    (answer.present? && answer.id.present?) || field.form.expired?
+  end
+
   def display_text_field(field, answer, form)
     value = answer.present? ? answer.value : field.default_value
-    text_field(form, field.name.to_slug, :value => value, :disabled => answer.present?)
+    text_field(form, "#{field.id}", :value => value, :disabled => display_disabled?(field, answer))
+  end
+
+  def default_selected(field, answer)
+    answer.present? ? answer.value.split(',') : field.alternatives.select {|a| a.selected_by_default}.map{|a| a.id.to_s}
   end
   def display_select_field(field, answer, form)
-    if field.list && field.multiple
-      selected = answer.present? ? answer.value.split(',') : []
-      select_tag "#{form}[#{field.name.to_slug}]", options_for_select(field.choices.to_a, selected), :multiple => true, :size => field.choices.size, :disabled => answer.present?
-    elsif !field.list && field.multiple
-      field.choices.map do |name, value|
-        default = answer.present? ? answer.value.split(',').include?(value) : false
-        labelled_check_box name, "#{form}[#{field.name.to_slug}][#{value}]", '1', default, :disabled => answer.present?
+    case field.select_field_type
+    when 'select'
+      selected = default_selected(field, answer)
+      select_tag form.to_s + "[#{field.id}]", options_for_select([['','']] + field.alternatives.map {|a| [a.label, a.id.to_s]}, selected), :disabled => display_disabled?(field, answer)
+    when 'multiple_select'
+      selected = default_selected(field, answer)
+      select_tag form.to_s + "[#{field.id}]", options_for_select(field.alternatives.map{|a| [a.label, a.id.to_s]}, selected), :multiple => true, :title => _('Hold down Ctrl to select options'), :size => field.alternatives.size, :disabled => display_disabled?(field, answer)
+    when 'check_box'
+      field.alternatives.map do |alternative|
+        default = answer.present? ? answer.value.split(',').include?(alternative.id.to_s) : alternative.selected_by_default
+        labelled_check_box alternative.label, form.to_s + "[#{field.id}][#{alternative.id}]", '1', default, :disabled => display_disabled?(field, answer)
       end.join("\n")
-    elsif field.list && !field.multiple
-      selected = answer.present? ? answer.value.split(',') : []
-      select_tag "#{form}[#{field.name.to_slug}]", options_for_select([['','']] + field.choices.to_a, selected), :disabled => answer.present?
-    elsif !field.list && !field.multiple
-      field.choices.map do |name, value|
-        default = answer.present? ? answer.value == value : true
-        labelled_radio_button name, "#{form}[#{field.name.to_slug}]", value, default, :disabled => answer.present?
+    when 'radio'
+      field.alternatives.map do |alternative|
+        default = answer.present? ? answer.value == alternative.id.to_s : alternative.selected_by_default
+        labelled_radio_button alternative.label, form.to_s + "[#{field.id}]", alternative.id, default, :disabled => display_disabled?(field, answer)
       end.join("\n")
     end
   end
   def radio_button?(field)
-    type_for_options(field.class) == 'select_field' && !field.list && !field.multiple
+    type_for_options(field.class) == 'select_field' && field.select_field_type == 'radio'
   end
   def check_box?(field)
-    type_for_options(field.class) == 'select_field' && !field.list && field.multiple
+    type_for_options(field.class) == 'select_field' && field.select_field_type == 'check_box'
   end
   def build_answers(submission, form)
     answers = []
     form.fields.each do |field|
       final_value = ''
-      if submission.has_key?(field.slug)
-        value = submission[field.slug]
+      if submission.has_key?(field.id.to_s)
+        value = submission[field.id.to_s]
         if value.kind_of?(String)
           final_value = value
         elsif value.kind_of?(Array)
@@ -5,11 +5,29 @@ class CustomFormsPlugin::MembershipSurvey &lt; Task
   include CustomFormsPlugin::Helper
+  named_scope :from, lambda {|profile| {:conditions => {:requestor_id => profile.id}}}
+
   def perform
     form = CustomFormsPlugin::Form.find(form_id)
+    raise 'Form expired' if form.expired?
+
     answers = build_answers(submission, form)
     s = CustomFormsPlugin::Submission.create!(:form => form, :profile => target)
-    answers.map {|answer| answer.submission = s; answer.save!}
+    s.answers.push(*answers)
+
+    failed_answers = answers.select {|answer| !answer.valid? }
+    if failed_answers.empty?
+      s.save!
+    else
+      s.errors.clear
+      answers.each do |answer|
+        answer.valid?
+        answer.errors.each do |attribute, msg|
+          s.errors.add(answer.field.id.to_s.to_sym, msg)
+        end
+      end
+      raise ActiveRecord::RecordInvalid, s
+    end
   end
   def title
 class CustomFormsPlugin::SelectField < CustomFormsPlugin::Field
   set_table_name :custom_forms_plugin_fields
-  validates_presence_of :choices
+  validates_inclusion_of :select_field_type, :in => %w(radio check_box select multiple_select)
+  validates_length_of :alternatives, :minimum => 1, :message => 'can\'t be empty'
 end
@@ -2,11 +2,20 @@ class CustomFormsPlugin::Submission &lt; Noosfero::Plugin::ActiveRecord
   belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
   belongs_to :profile
-  has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
+  has_many :answers, :class_name => 'CustomFormsPlugin::Answer', :dependent => :destroy
   validates_presence_of :form
   validates_presence_of :author_name, :author_email, :if => lambda {|submission| submission.profile.nil?}
   validates_uniqueness_of :author_email, :scope => :form_id, :allow_nil => true
   validates_format_of :author_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|submission| !submission.author_email.blank?})
+
+  def self.human_attribute_name(attrib)
+    if /\d+/ =~ attrib and (f = CustomFormsPlugin::Field.find_by_id(attrib.to_i))
+      f.name
+    else
+      attrib
+    end
+  end
+
 end
@@ -13,7 +13,26 @@ module RoleAssignmentTrigger
           end
         end
       end
-  
+
+      before_validation_on_create do |ra|
+        proceed_creation = true
+        if ra.resource.kind_of?(Profile)
+          profile = ra.resource
+          person = ra.accessor
+          ok = !profile.nil? && !person.nil? && profile.environment.present?
+          if ok && profile.environment.plugin_enabled?(CustomFormsPlugin) && !person.is_member_of?(profile)
+            CustomFormsPlugin::Form.from(profile).for_admissions.each do |form|
+              admission_task_pending = person.tasks.pending.select {|task| task.kind_of?(CustomFormsPlugin::AdmissionSurvey) && task.form_id == form.id }.present?
+              admission_task_finished = person.tasks.finished.select {|task| task.kind_of?(CustomFormsPlugin::AdmissionSurvey) && task.form_id == form.id }.present?
+
+              CustomFormsPlugin::AdmissionSurvey.create!(:requestor => profile, :target => person, :form_id => form.id) unless admission_task_finished || admission_task_pending
+              proceed_creation = false unless admission_task_finished
+            end
+          end
+        end
+        proceed_creation
+      end
+
       after_destroy do |ra|
         if ra.resource.kind_of?(Profile)
           profile = ra.resource
@@ -24,6 +43,10 @@ module RoleAssignmentTrigger
               task = person.tasks.pending.select {|task| task.kind_of?(CustomFormsPlugin::MembershipSurvey) && task.form_id == form.id}.first
               task.cancel if task
             end
+            CustomFormsPlugin::Form.from(profile).for_admissions.each do |form|
+              task = person.tasks.pending.select {|task| task.kind_of?(CustomFormsPlugin::MembershipSurvey) && task.form_id == form.id}.first
+              task.cancel if task
+            end
           end
         end
       end
-jQuery('.icon-edit').live('click', function() {
-  elem = this;
-  jQuery.fn.colorbox({
-    overlayClose: false,
-    escKey: false,
-    inline: true,
-    href: function(){
-      id = jQuery(elem).attr('field_id');
-      type = jQuery('#fields_'+id+'_type').val().split('_')[0];
-      selector = '#edit-'+type+'-'+id
-      return selector
-    }
+var fixHelperSortable = function(e, tr) {
+  tr.children().each(function() {
+    jQuery(this).width(jQuery(this).width());
   });
-  return false;
-});
+  return tr;
+};
-jQuery('.remove-field').live('click', function(){
-  id = jQuery(this).attr('field_id');
-  jQuery('#field-'+id).slideDown(function(){
-    jQuery('#field-'+id).remove();
-  });
-  return false
-});
+var updatePosition = function(e, ui) {
+  var tag = ui.item[0].tagName.toLowerCase();
+  var count = ui.item.prevAll(tag).eq(0).find('input').filter(function() {return /_position/.test(this.id); }).val();
+  count = count ? ++count : 0;
-jQuery('.remove-option').live('click', function(){
-  field_id = jQuery(this).attr('field_id');
-  option_id = jQuery(this).attr('option_id');
-  selector = '#field-'+field_id+'-option-'+option_id
-  jQuery(selector).slideDown(function(){
-    jQuery(selector).remove();
-    jQuery.colorbox.resize();
-  });
-  return false
-});
+  ui.item.find('input').filter(function() {return /_position/.test(this.id); }).eq(0).val(count);
-function updateEditText(id){
-  new_id = id+1
-  jQuery('#edit-text-'+id).attr('id', 'edit-text-'+new_id);
-  input = jQuery('#edit-text-'+new_id+' input');
-  jQuery('#edit-text-'+new_id+' .colorbox-ok-button').attr('div_id', 'edit-text-'+new_id);
-  input.attr('id', input.attr('id').replace(id,new_id));
-  input.attr('name', input.attr('name').replace(id,new_id));
-  label = jQuery('#edit-text-'+new_id+' label');
-  label.attr('for', label.attr('for').replace(id,new_id));
+  for (i = 0; i < ui.item.nextAll(tag).length; i++) {
+    count++;
+    ui.item.nextAll(tag).eq(i).find('input').filter(function() {return /_position/.test(this.id); }).val(count);
+  }
 }
-function updateEditSelect(id){
-  new_id = id+1
-  jQuery('#edit-select-'+id).attr('id', 'edit-select-'+new_id);
-  jQuery('#edit-select-'+new_id+' .colorbox-ok-button').attr('div_id', 'edit-select-'+new_id);
-  jQuery('tr[id^=field-'+id+'-option').each(function(id, element){
-    jQuery(element).attr('id', jQuery(element).attr('id').replace('field-'+id,'field-'+new_id));
-  });
-  jQuery('#edit-select-'+new_id+' label').each(function(index, element){
-    label = jQuery(element);
-    label.attr('for', label.attr('for').replace(id,new_id));
-  });
-  jQuery('#edit-select-'+new_id+' input').each(function(index, element){
-    input = jQuery(element);
-    input.attr('id', input.attr('id').replace(id,new_id));
-    input.attr('name', input.attr('name').replace(id,new_id));
-  });
-  jQuery('#edit-select-'+new_id+' .remove-option').each(function(index, element){
-    jQuery(element).attr('field_id',new_id);
-  });
-  jQuery('#edit-select-'+new_id+' .new-option').attr('field_id',new_id);
-  jQuery('#edit-select-'+new_id+' #empty-option-'+id).attr('id','empty-option-'+new_id);
-}
+jQuery('tbody.field-list').sortable({
+  helper: fixHelperSortable,
+  update: updatePosition
+});
-function updateEmptyField(id){
-  id = parseInt(id);
-  empty_field = jQuery('#empty-field');
-  empty_field.attr('last_id', (id + 1).toString());
-  jQuery('#empty-field input').each(function(index, element){
-    new_id = jQuery(element).attr('id').replace(id,id+1);
-    jQuery(element).attr('id', new_id);
-    new_name = jQuery(element).attr('name').replace(id,id+1);
-    jQuery(element).attr('name', new_name);
-  });
-  jQuery('#empty-field select').each(function(index, element){
-    new_id = jQuery(element).attr('id').replace(id,id+1);
-    jQuery(element).attr('id', new_id);
-    new_name = jQuery(element).attr('name').replace(id,id+1);
-    jQuery(element).attr('name', new_name);
-  });
-  jQuery('#empty-field a').each(function(index, element){
-    jQuery(element).attr('field_id', id+1);
-  });
-  updateEditText(id);
-  updateEditSelect(id);
-}
+jQuery("ul.field-list").sortable({
+  placeholder: 'ui-state-highlight',
+  axis: 'y',
+  opacity: 0.8,
+  cursor: 'move',
+  tolerance: 'pointer',
+  forcePlaceholderSize: true,
+  update: updatePosition
+});
-function updateEmptyOption(field_id, option_id){
-  field_id = parseInt(field_id);
-  option_id = parseInt(option_id);
-  new_option_id = option_id+1;
-  empty_option = jQuery('#empty-option-'+field_id);
-  empty_option.attr('option_id',new_option_id);
-  jQuery('#empty-option-'+field_id+' .remove-option').attr('option_id', new_option_id);
+jQuery("ul.field-list li").disableSelection();
-  name_id = ' #fields_'+field_id+'_choices_'+option_id+'_name';
-  jQuery('#empty-option-'+field_id+name_id).attr('name', 'fields['+field_id+'][choices]['+new_option_id+'][name]');
-  jQuery('#empty-option-'+field_id+name_id).attr('id', 'fields_'+field_id+'_choices_'+new_option_id+'_name');
+var customFormsPlugin = {
+  removeFieldBox: function (button, confirmMsg) {
+    if (confirm(confirmMsg)) {
+      fb = jQuery(button).closest('.field-box');
+      jQuery('input.destroy-field', fb).val(1);
+      jQuery('> div', fb).slideUp({easing:'linear', complete:function(){fb.slideUp({easing:'linear', duration:250})}});
+    }
+  },
-  value_id = ' #fields_'+field_id+'_choices_'+option_id+'_value';
-  jQuery('#empty-option-'+field_id+value_id).attr('name', 'fields['+field_id+'][choices]['+new_option_id+'][value]');
-  jQuery('#empty-option-'+field_id+value_id).attr('id', 'fields_'+field_id+'_choices_'+new_option_id+'_value');
-}
+  removeAlternative: function (button, confirmMsg) {
+    if (confirm(confirmMsg)) {
+      alt = jQuery(button).closest('tr.alternative');
+      jQuery('input.destroy-field', alt).val(1);
+      alt.fadeOut(500, function() {
+        customFormsPlugin.checkHeaderDisplay(jQuery(button).closest('table'));
+      });
+    }
+  },
-jQuery('#new-field').live('click', function(){
-  empty_field = jQuery('#empty-field');
-  id = empty_field.attr('last_id');
-  edit_text = jQuery('#edit-text-'+id);
-  edit_select = jQuery('#edit-select-'+id);
-  new_field = empty_field.clone();
-  new_field.attr('id','field-'+id);
-  new_field.insertBefore(empty_field).slideDown();
-  edit_text.clone().insertAfter(edit_text);
-  edit_select.clone().insertAfter(edit_select);
-  updateEmptyField(id);
-  return false
-});
+  addFields: function (button, association, content) {
+    var new_id = new Date().getTime();
+    var regexp = new RegExp("new_" + association, "g");
+    content = content.replace(regexp, new_id);
-jQuery('.new-option').live('click', function(){
-  field_id = jQuery(this).attr('field_id');
-  empty_option = jQuery('#empty-option-'+field_id);
-  option_id = empty_option.attr('option_id');
-  new_option = empty_option.clone();
-  new_option.attr('id','field-'+field_id+'-option-'+option_id);
-  new_option.insertBefore(empty_option).slideDown();
-  jQuery.colorbox.resize();
-  updateEmptyOption(field_id, option_id);
-  return false
-});
+    if(association == 'alternatives') {
+      jQuery(content).appendTo(jQuery(button).closest('tfoot').next('tbody.field-list')).hide().slideDown();
+      jQuery(button).closest('table').find('tr:first').show();
+      jQuery(button).closest('tfoot').next('tbody.field-list').sortable({ helper: fixHelperSortable, update: updatePosition});
+    } else {
+      jQuery('<li>').append(jQuery(content)).appendTo(jQuery(button).parent().prev('ul.field-list')).hide().slideDown();
+    }
-jQuery('.colorbox-ok-button').live('click', function(){
-  jQuery('#'+jQuery(this).attr('div_id')).hide();
-  jQuery.colorbox.close();
-  return false
-});
+    jQuery('input').filter(function () { return new RegExp(new_id + "_position", "g").test(this.id); }).val(new_id);
+  },
+
+  checkHeaderDisplay: function(table) {
+    trs =jQuery('tr:visible', table);
+    if (trs.length <= 2) {
+      trs[0].style.display = 'none';
+    } else {
+      trs[0].style.display = 'table-row';
+    }
+  }
+}
@@ -4,7 +4,7 @@
 }
 .action-table {
-  width: 100%; 
+  width: 100%;
   overflow: hidden;
 }
@@ -13,12 +13,9 @@
   text-align: center;
 }
-.action-table td{
-  cursor: move;
-}
-
 .action-table .actions{
   white-space: nowrap;
+  text-align: left;
 }
 .action-table .new-item{
@@ -31,3 +28,62 @@
 #colorbox .edit-information {
   display: block;
 }
+
+.field-box {
+  margin: 10px 0;
+}
+
+.field-box > div {
+  overflow: hide;
+}
+
+.field-box .button {
+  margin-left: 15px;
+}
+
+.field-box .addition-buttons .button {
+  margin: 0px;
+}
+
+.field-box .required-field label{
+  font-weight: bold;
+  color: #c00;
+}
+.field-box .required-field label:after {
+  content: ' (*)';
+}
+
+.field-select-type {
+  margin: 10px 0;
+}
+
+.field-text-default {
+  margin-top: 10px;
+}
+
+.field-list {
+  list-style-type: none;
+  margin: 0px;
+  padding: 0px;
+  cursor: move;
+}
+
+.field-list label, .field-list legend {
+  cursor: move;
+}
+
+ul.field-list > li > fieldset:hover {
+  border: 2px dotted #BBB;
+}
+
+tr.addition-buttons {
+  cursor: auto;
+}
+
+#ui-datepicker-div {
+  border: 1px solid #CCC;
+}
+.ui-slider-horizontal {
+  border: 1px solid #BBB;
+  border-radius: 4px;
+}
@@ -48,21 +48,22 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
           :access => 'logged',
           :begining => begining,
           :ending => ending,
-          :description => 'Cool form'},
-        :fields => {
-          1 => {
-            :name => 'Name',
-            :default_value => 'Jack',
-            :type => 'text_field'
-          },
-          2 => {
-            :name => 'Color',
-            :list => '1',
-            :type => 'select_field',
-            :choices => {
-              1 => {:name => 'Red', :value => 'red'},
-              2 => {:name => 'Blue', :value => 'blue'},
-              3 => {:name => 'Black', :value => 'black'}
+          :description => 'Cool form',
+          :fields_attributes => {
+            1 => {
+              :name => 'Name',
+              :default_value => 'Jack',
+              :type => 'CustomFormsPlugin::TextField'
+            },
+            2 => {
+              :name => 'Color',
+              :select_field_type => 'radio',
+              :type => 'CustomFormsPlugin::SelectField',
+              :alternatives_attributes => {
+                1 => {:label => 'Red'},
+                2 => {:label => 'Blue'},
+                3 => {:label => 'Black'}
+              }
             }
           }
         }
@@ -75,32 +76,30 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_equal 'Cool form', form.description
     assert_equal 2, form.fields.count
-    f1 = form.fields.first
-    f2 = form.fields.last
+    f1 = form.fields[0]
+    f2 = form.fields[1]
     assert_equal 'Name', f1.name
     assert_equal 'Jack', f1.default_value
     assert f1.kind_of?(CustomFormsPlugin::TextField)
     assert_equal 'Color', f2.name
-    assert_equal 'red', f2.choices['Red']
-    assert_equal 'blue', f2.choices['Blue']
-    assert_equal 'black', f2.choices['Black']
-    assert f2.list
+    assert_equal f2.alternatives.map(&:label).sort, ['Red', 'Blue', 'Black'].sort
+    assert_equal f2.select_field_type, 'radio'
     assert f2.kind_of?(CustomFormsPlugin::SelectField)
   end
-  should 'create fields in the order they are sent' do
+  should 'create fields in the order they are sent when no position defined' do
     format = '%Y-%m-%d %H:%M'
     num_fields = 10
     begining = Time.now.strftime(format)
     ending = (Time.now + 1.day).strftime(format)
     fields = {}
     num_fields.times do |i|
-      fields[i.to_s] = {
-        :name => i.to_s,
+      fields[i] = {
+        :name => (10-i).to_s,
         :default_value => '',
-        :type => 'text_field'
+        :type => 'CustomFormsPlugin::TextField'
       }
     end
     assert_difference CustomFormsPlugin::Form, :count, 1 do
@@ -110,29 +109,69 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
         :access => 'logged',
         :begining => begining,
         :ending => ending,
-        :description => 'Cool form'},
-        :fields => fields
+        :description => 'Cool form',
+        :fields_attributes => fields
+      }
     end
     form = CustomFormsPlugin::Form.find_by_name('My Form')
     assert_equal num_fields, form.fields.count
-    form.fields.find_each do |f|
-      assert_equal f.position, f.name.to_i
+    lst = 10
+    form.fields.each do |f|
+      assert f.name.to_i == lst
+      lst = lst - 1
     end
   end
+  should 'create fields in any position size' do
+    format = '%Y-%m-%d %H:%M'
+    begining = Time.now.strftime(format)
+    ending = (Time.now + 1.day).strftime(format)
+    fields = {}
+    fields['0'] = {
+      :name => '0',
+      :default_value => '',
+      :type => 'CustomFormsPlugin::TextField',
+      :position => '999999999999'
+    }
+    fields['1'] = {
+      :name => '1',
+      :default_value => '',
+      :type => 'CustomFormsPlugin::TextField',
+      :position => '1'
+    }
+    assert_difference CustomFormsPlugin::Form, :count, 1 do
+      post :create, :profile => profile.identifier,
+        :form => {
+        :name => 'My Form',
+        :access => 'logged',
+        :begining => begining,
+        :ending => ending,
+        :description => 'Cool form',
+        :fields_attributes => fields
+      }
+    end
+    form = CustomFormsPlugin::Form.find_by_name('My Form')
+    assert_equal 2, form.fields.count
+    assert form.fields.first.name == "1"
+    assert form.fields.last.name == "0"
+  end
+
   should 'edit a form' do
     form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
-    field = CustomFormsPlugin::TextField.create!(:form => form, :name => 'License')
     format = '%Y-%m-%d %H:%M'
     begining = Time.now.strftime(format)
     ending = (Time.now + 1.day).strftime(format)
-    post :edit, :profile => profile.identifier, :id => form.id,
-      :form => {:name => 'My Form', :access => 'logged', :begining => begining, :ending => ending, :description => 'Cool form'},
-      :fields => {1 => {:real_id => field.id.to_s, :name => 'Source'}}
+    assert_equal form.fields.length, 0
+
+    post :update, :profile => profile.identifier, :id => form.id,
+      :form => {:name => 'My Form', :access => 'logged', :begining => begining, :ending => ending, :description => 'Cool form',
+        :fields_attributes => {1 => {:name => 'Source'}}}
     form.reload
-    field.reload
+    assert_equal form.fields.length, 1
+
+    field = form.fields.last
     assert_equal 'logged', form.access
     assert_equal begining, form.begining.strftime(format)
@@ -149,5 +188,50 @@ class CustomFormsPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'textarea', :attributes => { :id => 'form_description', :class => 'mceEditor' }
   end
-end
+  should 'export submissions as csv' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    field = CustomFormsPlugin::TextField.create!(:name => "Title")
+    form.fields << field
+    answer = CustomFormsPlugin::Answer.create!(:value => 'example', :field => field)
+
+    sub1 = CustomFormsPlugin::Submission.create!(:author_name => "john", :author_email => 'john@example.com', :form => form)
+    sub1.answers << answer
+
+    bob = create_user('bob').person
+    sub2 = CustomFormsPlugin::Submission.create!(:profile => bob, :form => form)
+
+    get :submissions, :profile => profile.identifier, :id => form.id, :format => 'csv'
+    assert_equal @response.content_type, 'text/csv'
+    assert_equal @response.body.split("\n")[0], 'Timestamp,Name,Email,Title'
+    assert_equal @response.body.split("\n")[1], "#{sub1.updated_at.strftime('%Y/%m/%d %T %Z')},john,john@example.com,example"
+    assert_equal @response.body.split("\n")[2], "#{sub2.updated_at.strftime('%Y/%m/%d %T %Z')},bob,#{bob.email},\"\""
+  end
+
+  should 'order submissions by name or time' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    field = CustomFormsPlugin::TextField.create!(:name => "Title")
+    form.fields << field
+    sub1 = CustomFormsPlugin::Submission.create!(:author_name => "john", :author_email => 'john@example.com', :form => form)
+    bob = create_user('bob').person
+    sub2 = CustomFormsPlugin::Submission.create!(:profile => bob, :form => form)
+
+    get :submissions, :profile => profile.identifier, :id => form.id, :sort_by => 'time'
+    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'
+    assert_not_nil assigns(:sort_by)
+    assert_select 'table.action-table', /Author\W*Time\W*bob[\W\dh]*john[\W\dh]*/
+  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
@@ -23,9 +23,35 @@ class CustomFormsPluginProfileControllerTest &lt; ActionController::TestCase
     field2 = CustomFormsPlugin::TextField.create(:name => 'License', :form => form)
     assert_difference CustomFormsPlugin::Submission, :count, 1 do
-      post :show, :profile => profile.identifier, :id => form.id, :submission => {field1.name.to_slug => 'Noosfero', field2.name.to_slug => 'GPL'}
+      post :show, :profile => profile.identifier, :id => form.id, :submission => {field1.id.to_s => 'Noosfero', field2.id.to_s => 'GPL'}
     end
     assert !session[:notice].include?('not saved')
     assert_redirected_to :action => 'show'
   end
+
+  should 'disable fields if form expired' 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 => '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
@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::AdmissionSurveyTest < ActiveSupport::TestCase
+  should 'add member to community on perform' do
+    profile = fast_create(Community)
+    person = fast_create(Person)
+    form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
+    task = CustomFormsPlugin::AdmissionSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
+
+    assert_difference person.memberships, :count, 1 do
+      task.finish
+    end
+  end
+end
@@ -27,11 +27,24 @@ class CustomFormsPlugin::AnswerTest &lt; ActiveSupport::TestCase
     field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form, :mandatory => true)
     answer = CustomFormsPlugin::Answer.new(:field => field)
     answer.valid?
-    assert answer.errors.invalid?(field.slug.to_sym)
+    assert answer.errors.invalid?(:value)
     answer.value = "GPL"
     answer.valid?
-    assert !answer.errors.invalid?(field.slug.to_sym)
+    assert !answer.errors.invalid?(:value)
+  end
+
+  should 'make string representation show answers' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'ProjectName', :form => form)
+    answer = CustomFormsPlugin::Answer.new(:field => field, :value => 'MyProject')
+
+    field_select = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    alt = CustomFormsPlugin::Alternative.create!(:id => 1, :field => field_select, :label => 'GPL')
+    answer2 = CustomFormsPlugin::Answer.new(:field => field_select, :value => alt.id.to_s)
+
+    assert_equal 'MyProject', answer.to_s
+    assert_equal 'GPL', answer2.to_s
   end
 end
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 class CustomFormsPlugin::FieldTest < ActiveSupport::TestCase
-  should 'validate presence of form' do
-    field = CustomFormsPlugin::Field.new
-    field.valid?
-    assert field.errors.invalid?(:form)
-    assert field.errors.invalid?(:name)
-
-    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
-    field.form = form
-    field.name = 'License'
-    field.valid?
-    assert !field.errors.invalid?(:form)
-    assert !field.errors.invalid?(:name)
-  end
-
   should 'set slug before validation based on name' do
     field = CustomFormsPlugin::Field.new(:name => 'Name')
     field.valid?
     assert_equal field.name.to_slug, field.slug
   end
-  should 'validate uniqueness of slug scoped on the form' do
-    form1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
-    form2 = CustomFormsPlugin::Form.create!(:name => 'Open Source', :profile => fast_create(Profile))
-    f1 = CustomFormsPlugin::Field.create!(:name => 'License', :form => form1)
-    f2 = CustomFormsPlugin::Field.new(:name => 'License', :form => form1)
-    f3 = CustomFormsPlugin::Field.new(:name => 'License', :form => form2)
-
-    f2.valid?
-    f3.valid?
-
-    assert f2.errors.invalid?(:slug)
-    assert !f3.errors.invalid?(:slug)
-  end
-
   should 'set mandatory field as false by default' do
     field = CustomFormsPlugin::Field.new
     assert !field.mandatory
@@ -50,17 +22,6 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
     assert_includes field.answers, a2
   end
-  should 'serialize choices into a hash' do
-    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
-    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
-    field.choices = {'First' => 1, 'Second' => 2, 'Third' => 3}
-    field.save!
-
-    assert_equal 1, field.choices['First']
-    assert_equal 2, field.choices['Second']
-    assert_equal 3, field.choices['Third']
-  end
-
   should 'not destroy form after removing a field' do
     form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
     license_field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
@@ -72,26 +33,20 @@ class CustomFormsPlugin::FieldTest &lt; ActiveSupport::TestCase
     assert_equal form.fields, [license_field]
   end
-  should 'give positions by creation order' do
-    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
-    field_0 = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
-    field_1 = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
-    field_2 = CustomFormsPlugin::Field.create!(:name => 'Wiki', :form => form)
-    assert_equal 0, field_0.position
-    assert_equal 1, field_1.position
-    assert_equal 2, field_2.position
+  should 'have alternative if type is SelectField' do
+    select = CustomFormsPlugin::Field.new(:name => 'select_field001', :type => 'CustomFormsPlugin::SelectField')
+    assert !select.save
+
+    select.alternatives << CustomFormsPlugin::Alternative.new(:label => 'option')
+    assert select.save
   end
-  should 'not crash when adding new fields on a form with fields without position' do
-    form = CustomFormsPlugin::Form.create(:name => 'Free Software', :profile => fast_create(Profile))
-    field_0 = CustomFormsPlugin::Field.create(:name => 'License', :form => form)
-    field_0.position = nil
-    field_0.save
+  should 'sort alternatives by position' do
+    field = CustomFormsPlugin::Field.create!(:name => 'field001')
+    second = CustomFormsPlugin::Alternative.create!(:label => 'second', :field => field, :position => 2)
+    first = CustomFormsPlugin::Alternative.create!(:label => 'first', :field => field, :position => 1)
-    assert_nothing_raised do
-      field_1 = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form)
-    end
+    assert_equal field.alternatives, [first, second]
   end
-
 end
@@ -53,6 +53,20 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
     assert !form.errors.invalid?(:slug)
   end
+  should 'validate the difference between ending and beginning is positive' do
+    profile = fast_create(Profile)
+    form = CustomFormsPlugin::Form.new(:profile => profile, :name => 'Free Software')
+
+    form.begining = Time.now
+    form.ending = Time.now + 1.day
+    assert form.valid?
+    assert !form.errors.invalid?(:base)
+
+    form.ending = Time.now - 2.day
+    assert !form.valid?
+    assert form.errors.invalid?(:base)
+  end
+
   should 'define form expiration' do
     form = CustomFormsPlugin::Form.new
     assert !form.expired?
@@ -75,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?
@@ -180,4 +210,54 @@ class CustomFormsPlugin::FormTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'sort fields by position' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    license_field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form, :position => 2)
+    url_field = CustomFormsPlugin::Field.create!(:name => 'URL', :form => form, :position => 0)
+
+    assert_equal form.fields, [url_field, license_field]
+  end
+
+  should 'have a named_scope that retrieves all forms required for membership' do
+    profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:name => 'For admission 1', :profile => profile, :for_admission => true)
+    f2 = CustomFormsPlugin::Form.create!(:name => 'For admission 2', :profile => profile, :for_admission => true)
+    f3 = CustomFormsPlugin::Form.create!(:name => 'Not for admission', :profile => profile, :for_admission => false)
+    scope = CustomFormsPlugin::Form.from(profile).for_admissions
+
+    assert_equal ActiveRecord::NamedScope::Scope, scope.class
+    assert_includes scope, f1
+    assert_includes scope, f2
+    assert_not_includes scope, f3
+  end
+
+  should 'not include admission membership in on membership named scope' do
+    profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:name => 'On membership', :profile => profile, :on_membership => true)
+    f2 = CustomFormsPlugin::Form.create!(:name => 'For admission', :profile => profile, :on_membership => true, :for_admission => true)
+    scope = CustomFormsPlugin::Form.from(profile).on_memberships
+
+    assert_equal ActiveRecord::NamedScope::Scope, scope.class
+    assert_includes scope, f1
+    assert_not_includes scope, f2
+  end
+
+  should 'cancel survey tasks after removing a form' do
+    profile = fast_create(Profile)
+    person = fast_create(Person)
+
+    form1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
+    form2 = CustomFormsPlugin::Form.create!(:name => 'Operation System', :profile => profile)
+
+    task1 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form1.id, :target => person, :requestor => profile)
+    task2 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form2.id, :target => person, :requestor => profile)
+
+    assert_includes Task.opened, task1
+    assert_includes Task.opened, task2
+    form1.destroy
+    assert_includes Task.canceled, task1
+    assert_includes Task.opened, task2
+    form2.destroy
+    assert_includes Task.canceled, task2
+  end
 end
@@ -16,16 +16,29 @@ class CustomFormsPlugin::MembershipSurveyTest &lt; ActiveSupport::TestCase
     person = fast_create(Person)
     form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
     field = CustomFormsPlugin::Field.create!(:name => 'Name', :form => form)
-    task = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :submission => {'name' => 'Jack'}, :target => person, :requestor => profile)
+    task = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :submission => {field.id.to_s => 'Jack'}, :target => person, :requestor => profile)
     assert_difference CustomFormsPlugin::Submission, :count, 1 do
       task.finish
     end
     submission = CustomFormsPlugin::Submission.last
-    assert_equal submission.answers.count, 1 
+    assert_equal submission.answers.count, 1
     answer = submission.answers.first
     assert_equal answer.value, 'Jack'
   end
+
+  should 'have a named_scope that retrieves all tasks requested by profile' do
+    profile = fast_create(Profile)
+    person = fast_create(Person)
+    form = CustomFormsPlugin::Form.create!(:name => 'Simple Form', :profile => profile)
+    task1 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => profile)
+    task2 = CustomFormsPlugin::MembershipSurvey.create!(:form_id => form.id, :target => person, :requestor => fast_create(Profile))
+    scope = CustomFormsPlugin::MembershipSurvey.from(profile)
+
+    assert_equal ActiveRecord::NamedScope::Scope, scope.class
+    assert_includes scope, task1
+    assert_not_includes scope, task2
+  end
 end
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 class CustomFormsPlugin::SelectFieldTest < ActiveSupport::TestCase
-  should 'validate presence of choices, multiple and list' do
-    select = CustomFormsPlugin::SelectField.new
-    select.valid?
-    assert select.errors.invalid?(:choices)
-
-    select.choices = {'label' => 'value'}
-    select.valid?
-    assert !select.errors.invalid?(:choices)
+  should 'have alternative' do
+    select = CustomFormsPlugin::SelectField.new(:name => 'select_field001' )
+    assert !select.save
+
+    select.alternatives << CustomFormsPlugin::Alternative.new(:label => 'option')
+    assert select.save
+  end
+
+  should 'validate type' do
+    select = CustomFormsPlugin::SelectField.new(:name => 'select_field001' )
+    select.alternatives << CustomFormsPlugin::Alternative.new(:label => 'option')
+
+    select.update_attribute(:select_field_type, 'random')
+    assert select.invalid?
+
+    select.update_attribute(:select_field_type, 'radio')
+    assert select.valid?
+    select.update_attribute(:select_field_type, 'check_box')
+    assert select.valid?
+    select.update_attribute(:select_field_type, 'select')
+    assert select.valid?
+    select.update_attribute(:select_field_type, 'multiple_select')
+    assert select.valid?
   end
 end
@@ -27,25 +27,46 @@ class RoleAssignmentsTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'cancel membership_surveys if membership is undone and task is active' do
+  should 'cancel surveys if membership is undone and task is active' do
     environment = Environment.default
     environment.enable_plugin(CustomFormsPlugin)
     organization = fast_create(Organization)
     person = fast_create(Person)
-    form = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form', :on_membership => true)
+    form1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :on_membership => true)
     organization.add_member(person)
     assert_difference CustomFormsPlugin::MembershipSurvey.pending, :count, -1 do
       organization.remove_member(person)
     end
+    form2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :for_admission => true)
     organization.add_member(person)
-    task = CustomFormsPlugin::MembershipSurvey.last
-    task.status = Task::Status::FINISHED
-    task.save!
+
+    assert_difference CustomFormsPlugin::AdmissionSurvey.pending, :count, -1 do
+      organization.remove_member(person)
+    end
+
+    organization.add_member(person)
+    tasks = CustomFormsPlugin::MembershipSurvey.all.last(2)
+    tasks.each {|t| t.status = Task::Status::FINISHED }
+    tasks.each {|t| t.save! }
     assert_no_difference CustomFormsPlugin::MembershipSurvey.finished, :count do
       organization.remove_member(person)
     end
   end
-end
+  should 'create admission survey when atempted membership' do
+    environment = Environment.default
+    environment.enable_plugin(CustomFormsPlugin)
+    organization = fast_create(Organization)
+    person = fast_create(Person)
+    f1 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 1', :for_admission => true)
+    f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :for_admission => true)
+    f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :for_admission => false)
+
+    assert_difference CustomFormsPlugin::AdmissionSurvey, :count, 2 do
+      organization.add_member(person)
+    end
+    assert !organization.members.include?(person)
+  end
+end
-<% elem_id = "edit-select-#{counter}" %>
-<div id=<%= elem_id %> class='edit-information'>
+<div class='edit-information edit-select'>
   <h2><%= _('Options') %></h2>
   <table class='action-table' style='width: 420px'>
     <tr>
       <th style='width: 40%'><%= _('Name') %></th>
       <th style='width: 40%'><%= _('Value') %></th>
-      <th style='width: 20%'><%= _('Actions') %></th>
+      <th style='width: 20%'><%= _('Delete') %></th>
     </tr>
     <% option_counter = 1 %>
     <% (field.choices || {}).each do |name, value| %>
@@ -1,10 +0,0 @@
-<% elem_id = "edit-text-#{counter}" %>
-<div id=<%= elem_id %> class='edit-information'>
-  <h2><%= _('Default value') %></h2>
-  <%= labelled_form_field _('Default value'), text_field("fields[#{counter}]", :default_value, :value => field.default_value) %>
-
-  <% button_bar do %>
-    <%= button :ok, _('Ok'), '#', :class => 'colorbox-ok-button', :div_id => elem_id %>
-  <% end %>
-</div>
-
-<tr id=<%= "field-#{counter}" %>>
-  <td style="text-align: left"><%= text_field "fields[#{counter}]", :name, :value => field.name, :size => 25 %></td>
-  <td><%= type_to_label(field.type) %></td>
-  <%= hidden_field "fields[#{counter}]", :type, :value => type_for_options(field.class) %>
-  <td><%= check_box "fields[#{counter}]", :mandatory, :checked => field.mandatory %></td>
-  <%= hidden_field "fields[#{counter}]", :real_id, :value => field.id %>
-  <%= hidden_field "fields[#{counter}]", :form_id, :value => @form.id %>
-  <td class='actions'>
-    <%= button_without_text :edit, _('Edit'), '#', :field_id => counter %>
-    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-field', :field_id => counter,  :confirm => _('Are you sure you want to remove this field?') %>
-  </td>
-</tr>
+<fieldset class="field-box" <%='style="display:none"' if f.object._destroy %> >
+  <legend><%= type_to_label(f.object.type) %></legend>
+  <div>
+  <%= required f.label :name, _('Name:') %>
+  <%= f.text_field :name, :style => 'width: 14em' %>
+
+  <%= f.hidden_field :type %>
+
+  <%= f.check_box :mandatory %>
+  <%= f.label :mandatory, _('Mandatory') %>
+
+  <%= f.hidden_field(:position) %>
+
+  <%= f.hidden_field :_destroy, :class => 'destroy-field' %>
+  <%= button_to_function :delete, _('Remove field'), "customFormsPlugin.removeFieldBox(this, #{_('Are you sure you want to remove this field?').to_json})" %>
+  <%= yield %>
+</div>
+</fieldset>
 <% self.extend(CustomFormsPlugin::Helper) %>
 <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
-<%= error_messages_for :form %>
-
-<% form_for :form, @form do |f| %>
-  <%= required labelled_form_field _('Name'), f.text_field(:name) %>
-  <%= labelled_form_field(_('Period'), (
-    date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending, 
-                     '%Y-%m-%d %H:%M', 
-                     { :time => true, :change_month => true, :change_year => true,
-                       :date_format => 'yy-mm-dd', :time_format => 'hh:mm' },
+<%= f.error_messages %>
+<%= required labelled_form_field _('Name'), f.text_field(:name) %>
+<%= labelled_form_field(_('What is the time limit for this form to be filled?'), (
+  date_range_field('form[begining]', 'form[ending]', @form.begining, @form.ending,
+                   '%Y-%m-%d %H:%M',
+                   { :time => true, :change_month => true, :change_year => true,
+                     :date_format => 'yy-mm-dd', :time_format => 'hh:mm' },
                      { :size => 14 })
-  )) %>
-  <%= labelled_form_field _('Access'), f.select(:access, access_options(profile))%>
-  <% if profile.organization? %>
-    <%= labelled_form_field _('Triggered on membership'), f.check_box(:on_membership) %>
-  <% end %>
-  <%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
+)) %>
+<%= labelled_form_field _('Access'), f.select(:access, access_options(profile))%>
+<% if profile.organization? %>
+  <p>
+  <%= labelled_check_box _('Triggered on membership request as requirement for approval'), 'form[for_admission]', '1', @form.for_admission %>
+  <br/>
+  <%= labelled_check_box _('Triggered after membership'), 'form[on_membership]', '1', @form.on_membership %>
+  </p>
+<% end %>
+<%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
-  <h2><%= _('Fields') %></h2>
-  <table class="action-table" id='fields-table'>
-    <tr>
-      <th style='width: 40%'><%= _('Name') %></th>
-      <th style='width: 30%'><%= _('Type') %></th>
-      <th style='width: 10%'><%= _('Mandatory') %></th>
-      <th style='width: 20%'><%= _('Actions') %></th>
-    </tr>
-    <% counter = 1 %>
-    <% @fields.each do |field| %>
-      <%= render :partial => 'field', :locals => {:field => field, :counter => counter} %>
-      <% counter += 1 %>
-    <% end %>
-    <%= render :partial => 'empty_field', :locals => {:field => @empty_field, :counter => counter} %>
-    <tr class='new-item'>
-      <td colspan='5'>
-        <%= button(:add, _('Add a new field'), '#', :id => 'new-field')%>
-      </td>
-    </tr>
-  </table>
+<h2><%= _('Fields') %></h2>
-  <% counter = 1 %>
-  <% @fields.each do |field| %>
-    <%= render :partial => 'edit_text', :locals => {:field => field, :counter => counter} %>
-    <%= render :partial => 'edit_select', :locals => {:field => field, :counter => counter} %>
-    <% counter += 1 %>
+<ul class='field-list'>
+  <% f.fields_for :fields do |builder| %>
+    <li>
+      <%= render partial_for_class(builder.object.class), :f => builder %>
+    </li>
   <% end %>
+</ul>
-  <%= render :partial => 'edit_text', :locals => {:field => @empty_field, :counter => counter} %>
-  <%= render :partial => 'edit_select', :locals => {:field => @empty_field, :counter => counter} %>
+<div class="addition-buttons">
+  <%= button(:add, _('Add a new text field'), '#', :onclick => "customFormsPlugin.addFields(this, 'fields', #{html_for_field(f, :fields, CustomFormsPlugin::TextField).to_json}); return false")%>
+  <%= button(:add, _('Add a new select field'), '#', :onclick => "customFormsPlugin.addFields(this, 'fields', #{html_for_field(f, :fields, CustomFormsPlugin::SelectField).to_json}); return false")%>
+</div>
-  <% button_bar do %>
-    <%= submit_button :save, _('Save'), :cancel => {:action => 'index'}%>
-  <% end %>
+<% button_bar do %>
+  <%= submit_button :save, _('Save'), :cancel => {:action => 'index'}%>
 <% end %>
 <%= javascript_include_tag '../plugins/custom_forms/field' %>
@@ -1,7 +0,0 @@
-<tr id=<%= "field-#{counter}-option-#{option_counter}" %> style="display: auto;">
-  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][name]", name) %></td>
-  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][value]", value) %></td>
-  <td class='actions'>
-    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-option', :field_id => counter, :option_id => option_counter,  :confirm => _('Are you sure you want to remove this option?') %>
-  </td>
-</tr>
@@ -1,2 +0,0 @@
-<h1><%= _('New form') %></h1>
-<%= render :partial => 'form' %>
@@ -0,0 +1,12 @@
+<tr class="alternative">
+  <td> <%= f.text_field(:label) %> </td>
+
+  <td> <%= f.check_box(:selected_by_default) %> </td>
+
+  <%= f.hidden_field(:position) %>
+
+  <td>
+    <%= f.hidden_field :_destroy, :class => 'destroy-field' %>
+    <%= button_to_function_without_text :remove, _('Remove alternative'), "customFormsPlugin.removeAlternative(this, #{_('Are you sure you want to remove this alternative?').to_json})", :class => 'remove-field', :title => _('Remove alternative') %>
+  </td>
+</tr>
@@ -0,0 +1,9 @@
+<%-# Small hack necessary for fields_for when validation fails on #new %>
+<% case f.object.type
+   when 'CustomFormsPlugin::SelectField' %>
+  <%= render partial_for_class(CustomFormsPlugin::SelectField), :f => f %>
+<% when 'CustomFormsPlugin::TextField' %>
+  <%= render partial_for_class(CustomFormsPlugin::TextField), :f => f %>
+<% else %>
+  <% raise 'This field has no valid type' %>
+<% end %>
@@ -0,0 +1,36 @@
+<% render :layout => 'field', :locals => { :f => f } do %>
+  <div class="field-select-type">
+    <%= _('Type:') %>
+    <%= f.radio_button(:select_field_type, 'radio') %>
+    <%= f.label(:select_field_type, _('Radio'), :value => 'radio') %>
+    <%= f.radio_button(:select_field_type, 'check_box') %>
+    <%= f.label(:select_field_type, _('Checkbox'), :value => 'check_box') %>
+    <%= f.radio_button(:select_field_type, 'select') %>
+    <%= f.label(:select_field_type, _('Drop down'), :value => 'select') %>
+    <%= f.radio_button(:select_field_type, 'multiple_select') %>
+    <%= f.label(:select_field_type, _('Multiple Select'), :value => 'multiple_select') %>
+  </div>
+
+  <table>
+    <thead>
+    <tr <%='style="display:none"' if f.object.alternatives.empty? %>>
+      <th><%= _('Alternative') %></th>
+      <th><%= _('Preselected') %></th>
+      <th><%= _('Remove') %></th>
+    </tr>
+    </thead>
+    <tfoot>
+    <tr class="addition-buttons">
+      <td colspan="3">
+      <%= button(:add, _('Add a new alternative'), '#', :onclick => "customFormsPlugin.addFields(this, 'alternatives', #{html_for_field(f, :alternatives, CustomFormsPlugin::Alternative).to_json}); return false") %>
+      </td>
+    </tr>
+    </tfoot>
+    <tbody class='field-list'>
+    <% f.fields_for :alternatives do |builder| %>
+      <%= render partial_for_class(builder.object.class), :f => builder %>
+    <% end %>
+    </tbody>
+  </table>
+
+<% end %>
@@ -0,0 +1,6 @@
+<% render :layout => 'field', :locals => { :f => f } do %>
+  <div class="field-text-default">
+    <%= f.label(:default_value, _('Default text:')) %>
+    <%= f.text_field(:default_value) %>
+  </div>
+<% end %>
 <h1><%= _('Edit form') %></h1>
-<%= render :partial => 'form' %>
+
+<% form_for :form, @form, :url => { :action => 'update', :id => params[:id] } do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+<% end %>
@@ -17,12 +17,14 @@
       <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 :search, _('Pending'), :action => 'pending', :id => form.id if form.for_admission %>
+        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :id => form.id}, :confirm => _('Are you sure you want to remove this form?') %>
+      </td>
     </tr>
   <% end %>
   <tr id="new-item">
     <td colspan='5'>
-      <%= button(:add, _('Add a new form'), :action => 'create')%>
+      <%= button(:add, _('Add a new form'), :action => 'new')%>
    </td>
   </tr>
 </table>
@@ -0,0 +1,5 @@
+<h1><%= _('New form') %></h1>
+
+<% form_for :form, @form, :url => { :action => 'create', :id => params[:id] }  do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f}  %>
+<% end %>
@@ -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 %>
@@ -5,6 +5,13 @@
 <% if @form.submissions.empty? %>
   <%= _('There are no submissions for this form.') %>
 <% else %>
+  <p>
+    <%= _('Download all form responses as') %>:
+    <%= 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') %>
+  </p>
   <table class="action-table">
     <tr>
       <th style='width: 50%'><%= _('Author') %></th>
@@ -2,6 +2,14 @@
 <p><%= @form.description %></p>
 <% if @submission.id.nil? %>
+  <% if @form.expired? %>
+    <% 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 %>
   <% form_for :submission, @submission do |f| %>
@@ -13,8 +21,13 @@
     <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
     <% button_bar do %>
-      <%= submit_button :save, _('Save'), :cancel => {:controller=>:profile, :profile => profile.identifier} %>
+      <% if @form.expired? %>
+        <%= submit_button :save, _('Save'), :disabled => '', :class => 'disabled', :cancel => {:controller => :profile, :profile => profile.identifier} %>
+      <% else %>
+        <%= submit_button :save, _('Save'), :cancel => {:controller => :profile, :profile => profile.identifier} %>
+      <% end %>
     <% end %>
+
   <% end %>
 <% else %>
   <% fields_for :submission, @submission do |f| %>
@@ -3,8 +3,14 @@
 <h2><%= @form.name %></h2>
 <p><%= @form.description %></p>
+<% if @form.expired? %>
+  <% 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| %>
-  <%#= fi.error_messages_for :submission %>
   <%= render :partial => 'shared/form_submission', :locals => {:f => fi} %>
 <% end %>
@@ -10441,6 +10441,18 @@ msgstr &quot;Bloco salvo com sucesso.&quot;
 msgid "Sub-organizations updated"
 msgstr "Sub-organizações atualizadas"
+#: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:26
+msgid "Custom form #{@form.name} was successfully created."
+msgstr "O formulário #{@form.name} foi criado com sucesso."
+
+#: plugins/custom_forms/controllers/custom_forms_plugin_myprofile_controller.rb:46
+msgid "Custom form #{@form.name} was successfully updated."
+msgstr "O formulário #{@form.name} foi atualizado com sucesso."
+
+#: plugins/tolerance_time/controllers/tolerance_time_plugin_myprofile_controller.rb:10
+msgid "Tolerance updated"
+msgstr "A tolerância foi atualizada"
+
 #: plugins/sub_organizations/controllers/sub_organizations_plugin_myprofile_controller.rb:28
 msgid "Sub-organizations could not be updated"
 msgstr "As sub-organizações não puderam ser salvas"
@@ -11087,6 +11099,15 @@ msgstr &quot;%s artigos encontrados&quot;
 msgid "%s events found"
 msgstr "%s eventos encontrados"
+#: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:87
+msgid "Hold down Ctrl to select options"
+msgstr "Segure Ctrl para selecionar as opções"
+
+#: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:4
+#: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:37
+msgid "Logged users"
+msgstr "Usuários logados"
+
 #: plugins/solr/lib/solr_plugin/search_helper.rb:138
 msgid "%s people found"
 msgstr "%s pessoas encontradas"
@@ -11119,6 +11140,47 @@ msgstr &quot;Um plugin que mostra grupos de comentários.&quot;
 msgid "A plugin that add a container block."
 msgstr "Um plugin que adiciona um bloco container."
+#: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:58
+msgid "Text field"
+msgstr "Campo de texto"
+
+#: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:59
+msgid "Select field"
+msgstr "Campo de seleção"
+
+#: plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb:16
+msgid "Membership survey"
+msgstr "Pesquisa na associação de novos integrantes"
+
+#: plugins/custom_forms/lib/custom_forms_plugin/admission_survey.rb:9
+msgid "Admission survey"
+msgstr "Questionário para associação"
+
+#: plugins/custom_forms/lib/custom_forms_plugin/admission_survey.rb:13
+msgid "%{requestor} wants you to fill in some information before joining."
+msgstr "%{requestor} quer que você preencha algumas informações antes de se associar."
+
+#: plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb:28
+msgid "%{requestor} wants you to fill in some information."
+msgstr "%{requestor} quer que você preencha algumas informações."
+
+#: plugins/custom_forms/lib/custom_forms_plugin/admission_survey.rb:17
+msgid ""
+"Before joining %{requestor}, the administrators of this organization\n"
+"      wants you to fill in some further information."
+msgstr ""
+"Antes de entrar em %{requestor}, os administradores dessa organização\n"
+" querem que você preencha algumas informações adicionais."
+
+#: plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb:40
+msgid ""
+"After joining %{requestor}, the administrators of this organization\n"
+"      wants you to fill in some further information."
+msgstr ""
+"Após entrar em %{requestor}, os administradores dessa organização\n"
+" querem que você preencha algumas informações adicionais."
+>>>>>>> custom_forms
+
 #: plugins/container_block/lib/container_block_plugin/container_block.rb:11
 msgid "Container"
 msgstr "Container"
@@ -12106,6 +12168,39 @@ msgstr &quot;Horas&quot;
 msgid "Content edition tolerance time"
 msgstr "Tempo de tolerância para edição de conteúdo"
+#: 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
+msgid "Are you sure you want to remove this field?"
+msgstr "Tem certeza de que deseja remover este campo?"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_field.html.erb:3
+msgid "Remove field"
+msgstr "Remover campo"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:3
+msgid "Manage forms"
+msgstr "Gerenciar formulários"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:7
+msgid "Period"
+msgstr "Período"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:7
+msgid "What is the time limit for this form to be filled?"
+msgstr "Qual o período limite em que esse formulário pode ser preenchido?"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/index.html.erb:8
+msgid "Submissions"
+msgstr "Submissões"
+
 #: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:14
 msgid "Comment edition tolerance time"
 msgstr "Tempo de tolerância para edição de comentários"
@@ -12122,6 +12217,14 @@ msgstr &quot;Mostrando página %d de %d&quot;
 msgid "No filter available"
 msgstr "Nenhum filtro disponível"
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:14
+msgid "Triggered on membership request as requirement for approval"
+msgstr "Disparado para novos integrantes como requisito de aprovação"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:15
+msgid "Triggered after membership"
+msgstr "Disparado depois da aprovação de um novo integrante"
+
 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:4
 msgid "Sub-groups awaiting approval:"
 msgstr "Sub-grupos aguardando aprovação:"
@@ -12134,6 +12237,36 @@ msgstr &quot;Criar nova sub-comunidade&quot;
 msgid "Register a new sub-enterprise"
 msgstr "Registrar um novo sub-empreendimento"
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:30
+msgid "Add a new text field"
+msgstr "Adicionar novo campo de texto"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb:31
+msgid "Add a new select field"
+msgstr "Adicionar novo campo de seleção"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_option.html.erb:5
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/_empty_option.html.erb:5
+msgid "Are you sure you want to remove this option?"
+msgstr "Tem certeza de que deseja remover esta opção?"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/pending.html.erb:3
+msgid "Pending submissions for %s"
+msgstr "Submissões pendentes para %s"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/pending.html.erb:6
+msgid "There are no pending submissions for this form."
+msgstr "Não há submissões pendentes para esse formulário"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/pending.html.erb:13
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/pending.html.erb:9
+msgid "User"
+msgstr "Usuário"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/show_submission.html.erb:9
+msgid "Back to submissions"
+msgstr "Voltar para submissões"
+
 #: plugins/sub_organizations/views/sub_organizations_plugin_myprofile/index.html.erb:18
 msgid ""
 "Fill in the search field to find the groups that should be added as sub-"
@@ -12158,6 +12291,14 @@ msgstr &quot;&quot;
 "O fornecedor já recebeu o seu pedido de compra e deve te contactar para "
 "confirmação."
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/submissions.html.erb:9
+msgid "Download all form responses as"
+msgstr "Baixar todas as respostas como"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/submissions.html.erb:11
+msgid "Time"
+msgstr "Tempo"
+
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:12
 msgid "If you have any doubts, contact us at: %s"
 msgstr "Se você tem alguma dúvida, nos contacte em: %s"
@@ -12218,6 +12359,34 @@ msgstr &quot;Esse é um pedido de compra feito por %s.&quot;
 msgid "Below follows the customer informations:"
 msgstr "Abaixo seguem as informações do consumidor:"
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_text_field.html.erb:25
+msgid "Default text:"
+msgstr "Texto padrão:"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb:17
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb:18
+msgid "Preselected"
+msgstr "Pré-selecionado"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_select_field.html.erb:25
+msgid "Add a new alternative"
+msgstr "Adicionar nova alternativa"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
+msgid "Remove alternative"
+msgstr "Remover alternativa"
+
+#: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
+msgid "Are you sure you want to remove this alternative?"
+msgstr "Tem certeza que quer remover essa alternativa?"
+
+#: plugins/tolerance_time/views/tolerance_time_plugin_myprofile/index.html.erb:1
+msgid "Tolerance Adjustments"
+msgstr "Configurações de Tolerância"
+
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45
 msgid "And here are the items bought by this customer:"
 msgstr "E aqui estão os itens pedidos por esse consumidor:"
@@ -2533,11 +2533,11 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
 }
 /*** REQUIRED FIELDS ***/
-.required-field label {
+.required-field label.formlabel {
   font-weight: bold;
   color: #c00;
 }
-.required-field label:after {
+.required-field label.formlabel:after {
   content: ' (*)';
 }
 .login-box {
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class CreateCustomFormsPluginAlternatives < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :custom_forms_plugin_alternatives do \|t\|
	4	+ t.string :label
	5	+ t.references :field
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ drop_table :custom_forms_plugin_alternatives
	11	+ end
	12	+end
@@ -0,0 +1,32 @@		@@ -0,0 +1,32 @@
	1	+class AddSelectFieldTypeToCustomFormsPluginFields < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_table :custom_forms_plugin_fields do \|t\|
	4	+ t.string :select_field_type
	5	+ end
	6	+
	7	+ update("UPDATE custom_forms_plugin_fields SET select_field_type='radio' WHERE list IS FALSE AND multiple IS FALSE")
	8	+ update("UPDATE custom_forms_plugin_fields SET select_field_type='check_box' WHERE list IS FALSE AND multiple IS TRUE")
	9	+ update("UPDATE custom_forms_plugin_fields SET select_field_type='select' WHERE list IS TRUE AND multiple IS FALSE")
	10	+ update("UPDATE custom_forms_plugin_fields SET select_field_type='multiple_select' WHERE list IS TRUE AND multiple IS TRUE")
	11	+
	12	+ change_table :custom_forms_plugin_fields do \|t\|
	13	+ t.remove :multiple, :list
	14	+ end
	15	+ end
	16	+
	17	+ def self.down
	18	+ change_table :custom_forms_plugin_fields do \|t\|
	19	+ t.boolean :multiple
	20	+ t.boolean :list
	21	+ end
	22	+
	23	+ update("UPDATE custom_forms_plugin_fields SET list=TRUE, multiple=FALSE WHERE select_field_type='radio'")
	24	+ update("UPDATE custom_forms_plugin_fields SET list=FALSE, multiople=TRUE WHERE select_field_type='check_box'")
	25	+ update("UPDATE custom_forms_plugin_fields SET list=TRUE, multiple=FALSE WHERE select_field_type='select'")
	26	+ update("UPDATE custom_forms_plugin_fields SET list=TRUE, multiple=TRUE WHERE select_field_type='multiple_select'")
	27	+
	28	+ change_table :custom_forms_plugin_fields do \|t\|
	29	+ t.remove :select_fields_type
	30	+ end
	31	+ end
	32	+end
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+class AssociateFieldsToAlternatives < ActiveRecord::Migration
	2	+ class CustomFormsPlugin::Field < ActiveRecord::Base
	3	+ set_table_name :custom_forms_plugin_fields
	4	+ has_many :alternatives, :class_name => 'CustomFormsPlugin::Alternative'
	5	+ serialize :choices, Hash
	6	+ end
	7	+
	8	+ def self.up
	9	+ CustomFormsPlugin::Field.reset_column_information
	10	+
	11	+ CustomFormsPlugin::Field.find_each do \|f\|
	12	+ f.choices.each do \|key, value\|
	13	+ CustomFormsPlugin::Alternative.create!(:label => key, :field_id => f.id)
	14	+ end
	15	+ end
	16	+
	17	+ CustomFormsPlugin::Answer.find_each do \|answer\|
	18	+ labels = []
	19	+ answer.value.split(',').each do \|value\|
	20	+ labels << answer.field.choices.invert[value]
	21	+ end
	22	+ labels.compact!
	23	+ if labels.present?
	24	+ answer.value = answer.field.alternatives.where('label IN (?)', labels).map(&:id).join(',')
	25	+ answer.save!
	26	+ end
	27	+ end
	28	+
	29	+ change_table :custom_forms_plugin_fields do \|t\|
	30	+ t.remove :choices
	31	+ end
	32	+ end
	33	+
	34	+ def self.down
	35	+ raise ActiveRecord::IrreversibleMigration
	36	+ end
	37	+end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class UpdateSelectFieldTypeInCustomFormsPluginFields < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_column :custom_forms_plugin_fields, :select_field_type, :string, :null => false, :default => 'radio'
	4	+ end
	5	+
	6	+ def self.down
	7	+ raise ActiveRecord::IrreversibleMigration
	8	+ end
	9	+end
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+class AddSelectedByDefaultToCustomFormsPluginAlternatives < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :custom_forms_plugin_alternatives, :selected_by_default, :boolean, :null => false, :default => false
	4	+ CustomFormsPlugin::Field.find_each do \|f\|
	5	+ f.alternatives.each do \|a\|
	6	+ a.update_attribute(:selected_by_default, true) if a.label == f.default_value
	7	+ end
	8	+ end
	9	+ end
	10	+
	11	+ def self.down
	12	+ raise ActiveRecord::IrreversibleMigration
	13	+ end
	14	+end
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+class AddPositionToFieldAndAlternatives < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_table :custom_forms_plugin_alternatives do \|t\|
	4	+ t.integer :position, :default => 0
	5	+ end
	6	+
	7	+ update("UPDATE custom_forms_plugin_fields SET position=id")
	8	+ update("UPDATE custom_forms_plugin_alternatives SET position=id")
	9	+
	10	+ end
	11	+
	12	+ def self.down
	13	+ change_table :custom_forms_plugin_alternatives do \|t\|
	14	+ t.remove :position
	15	+ end
	16	+ end
	17	+end
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class AddAdmissionToForm < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_table :custom_forms_plugin_forms do \|t\|
	4	+ t.boolean :for_admission, :default => false
	5	+ end
	6	+
	7	+ CustomFormsPlugin::Form.find_each do \|f\|
	8	+ f.for_admission = false
	9	+ f.save!
	10	+ end
	11	+ end
	12	+
	13	+ def self.down
	14	+ change_table :custom_forms_plugin_forms do \|t\|
	15	+ t.remove :for_admission
	16	+ end
	17	+ end
	18	+end
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+class CustomFormsPlugin::AdmissionSurvey < CustomFormsPlugin::MembershipSurvey
	2	+
	3	+ def perform
	4	+ super
	5	+ requestor.add_member(target)
	6	+ end
	7	+
	8	+ def title
	9	+ _("Admission survey")
	10	+ end
	11	+
	12	+ def information
	13	+ {:message => _('%{requestor} wants you to fill in some information before joining.')}
	14	+ end
	15	+
	16	+ def target_notification_message
	17	+ _('Before joining %{requestor}, the administrators of this organization
	18	+ wants you to fill in some further information.') % {:requestor => requestor.name}
	19	+ end
	20	+
	21	+ def target_notification_description
	22	+ _('%{requestor} wants you to fill in some further information.') % {:requestor => requestor.name}
	23	+ end
	24	+end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+class CustomFormsPlugin::Alternative < ActiveRecord::Base
	2	+ set_table_name :custom_forms_plugin_alternatives
	3	+
	4	+ validates_presence_of :label
	5	+
	6	+ belongs_to :field, :class_name => 'CustomFormsPlugin::Field'
	7	+end
	8	+
	@@ -5,11 +5,29 @@ class CustomFormsPlugin::MembershipSurvey < Task		@@ -5,11 +5,29 @@ class CustomFormsPlugin::MembershipSurvey < Task
5		5
6	include CustomFormsPlugin::Helper	6	include CustomFormsPlugin::Helper
7		7
		8	+ named_scope :from, lambda {\|profile\| {:conditions => {:requestor_id => profile.id}}}
		9	+
8	def perform	10	def perform
9	form = CustomFormsPlugin::Form.find(form_id)	11	form = CustomFormsPlugin::Form.find(form_id)
		12	+ raise 'Form expired' if form.expired?
		13	+
10	answers = build_answers(submission, form)	14	answers = build_answers(submission, form)
11	s = CustomFormsPlugin::Submission.create!(:form => form, :profile => target)	15	s = CustomFormsPlugin::Submission.create!(:form => form, :profile => target)
12	- answers.map {\|answer\| answer.submission = s; answer.save!}	16	+ s.answers.push(*answers)
		17	+
		18	+ failed_answers = answers.select {\|answer\| !answer.valid? }
		19	+ if failed_answers.empty?
		20	+ s.save!
		21	+ else
		22	+ s.errors.clear
		23	+ answers.each do \|answer\|
		24	+ answer.valid?
		25	+ answer.errors.each do \|attribute, msg\|
		26	+ s.errors.add(answer.field.id.to_s.to_sym, msg)
		27	+ end
		28	+ end
		29	+ raise ActiveRecord::RecordInvalid, s
		30	+ end
13	end	31	end
14		32
15	def title	33	def title