Merge commit 'refs/merge-requests/231' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/231

Merge commit 'refs/merge-requests/231' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/231
Daniela Feitosa
2 parents 0be5d3e8 d0aadb3e
Showing 52 changed files with 3197 additions and 20 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/forms_helper.rb
app/models/task.rb
app/views/layouts/_javascript.rhtml
app/views/tasks/_task.rhtml
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/20120727162444_create_custom_forms_plugin_forms.rb
plugins/custom_forms/db/migrate/20120727174506_create_custom_forms_plugin_fields.rb
plugins/custom_forms/db/migrate/20120727175250_create_custom_forms_plugin_answers.rb
plugins/custom_forms/db/migrate/20120727180512_create_custom_forms_plugin_submissions.rb
plugins/custom_forms/lib/custom_forms_plugin.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/numeric.rb
plugins/custom_forms/lib/custom_forms_plugin/select_field.rb
plugins/custom_forms/lib/custom_forms_plugin/submission.rb
@@ -265,9 +265,9 @@ module ApplicationHelper
  
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
  
-  def partial_for_class_in_view_path(klass, view_path)
+  def partial_for_class_in_view_path(klass, view_path, suffix = nil)
     return nil if klass.nil?
-    name = klass.name.underscore
+    name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
  
     search_name = String.new(name)
     if search_name.include?("/")
@@ -285,28 +285,17 @@ module ApplicationHelper
     partial_for_class_in_view_path(klass.superclass, view_path)
   end
  
-  def partial_for_class(klass)
+  def partial_for_class(klass, suffix=nil)
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
     name = klass.name.underscore
     @controller.view_paths.each do |view_path|
-      partial = partial_for_class_in_view_path(klass, view_path)
+      partial = partial_for_class_in_view_path(klass, view_path, suffix)
       return partial if partial
     end
  
     raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
   end
  
-  def partial_for_task_class(klass, action)
-    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
-
-    name = "#{klass.name.underscore}_#{action.to_s}"
-    VIEW_EXTENSIONS.each do |ext|
-      return name if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], '_'+name+ext))
-    end
-
-    partial_for_task_class(klass.superclass, action)
-  end
-
   def view_for_profile_actions(klass)
     raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
  
@@ -123,6 +123,119 @@ module FormsHelper
     options_for_select.join("\n")
   end
  
+  def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+    datepicker_options[:disabled] ||= false
+    datepicker_options[:alt_field] ||= ''
+    datepicker_options[:alt_format] ||= ''
+    datepicker_options[:append_text] ||= ''
+    datepicker_options[:auto_size] ||= false
+    datepicker_options[:button_image] ||= ''
+    datepicker_options[:button_image_only] ||=  false
+    datepicker_options[:button_text] ||= '...'
+    datepicker_options[:calculate_week] ||= 'jQuery.datepicker.iso8601Week'
+    datepicker_options[:change_month] ||= false
+    datepicker_options[:change_year] ||= false
+    datepicker_options[:close_text] ||= _('Done')
+    datepicker_options[:constrain_input] ||= true
+    datepicker_options[:current_text] ||= _('Today')
+    datepicker_options[:date_format] ||= 'mm/dd/yy'
+    datepicker_options[:day_names] ||= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
+    datepicker_options[:day_names_min] ||= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
+    datepicker_options[:day_names_short] ||= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
+    datepicker_options[:default_date] ||= nil
+    datepicker_options[:duration] ||= 'normal'
+    datepicker_options[:first_day] ||= 0
+    datepicker_options[:goto_current] ||= false
+    datepicker_options[:hide_if_no_prev_next] ||= false
+    datepicker_options[:is_rtl] ||= false
+    datepicker_options[:max_date] ||= nil
+    datepicker_options[:min_date] ||= nil
+    datepicker_options[:month_names] ||= [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')]
+    datepicker_options[:month_names_short] ||= [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')]
+    datepicker_options[:navigation_as_date_format] ||= false
+    datepicker_options[:next_text] ||= _('Next')
+    datepicker_options[:number_of_months] ||= 1
+    datepicker_options[:prev_text] ||= _('Prev')
+    datepicker_options[:select_other_months] ||= false
+    datepicker_options[:short_year_cutoff] ||= '+10'
+    datepicker_options[:show_button_panel] ||= false
+    datepicker_options[:show_current_at_pos] ||= 0
+    datepicker_options[:show_month_after_year] ||= false
+    datepicker_options[:show_on] ||= 'focus'
+    datepicker_options[:show_options] ||= {}
+    datepicker_options[:show_other_months] ||= false
+    datepicker_options[:show_week] ||= false
+    datepicker_options[:step_months] ||= 1
+    datepicker_options[:week_header] ||= _('Wk')
+    datepicker_options[:year_range] ||= 'c-10:c+10'
+    datepicker_options[:year_suffix] ||= ''
+
+    element_id = html_options[:id] || 'datepicker-date'
+    value = value.strftime(format) if value.present?
+    method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
+    result = text_field_tag(name, value, html_options)
+    result +=
+    "
+    <script type='text/javascript'>
+      jQuery('##{element_id}').#{method}({
+        disabled: #{datepicker_options[:disabled].to_json},
+        altField: #{datepicker_options[:alt_field].to_json},
+        altFormat: #{datepicker_options[:alt_format].to_json},
+        appendText: #{datepicker_options[:append_text].to_json},
+        autoSize: #{datepicker_options[:auto_size].to_json},
+        buttonImage: #{datepicker_options[:button_image].to_json},
+        buttonImageOnly: #{datepicker_options[:button_image_only].to_json},
+        buttonText: #{datepicker_options[:button_text].to_json},
+        calculateWeek: #{datepicker_options[:calculate_week].to_json},
+        changeMonth: #{datepicker_options[:change_month].to_json},
+        changeYear: #{datepicker_options[:change_year].to_json},
+        closeText: #{datepicker_options[:close_text].to_json},
+        constrainInput: #{datepicker_options[:constrain_input].to_json},
+        currentText: #{datepicker_options[:current_text].to_json},
+        dateFormat: #{datepicker_options[:date_format].to_json},
+        dayNames: #{datepicker_options[:day_names].to_json},
+        dayNamesMin: #{datepicker_options[:day_names_min].to_json},
+        dayNamesShort: #{datepicker_options[:day_names_short].to_json},
+        defaultDate: #{datepicker_options[:default_date].to_json},
+        duration: #{datepicker_options[:duration].to_json},
+        firstDay: #{datepicker_options[:first_day].to_json},
+        gotoCurrent: #{datepicker_options[:goto_current].to_json},
+        hideIfNoPrevNext: #{datepicker_options[:hide_if_no_prev_next].to_json},
+        isRTL: #{datepicker_options[:is_rtl].to_json},
+        maxDate: #{datepicker_options[:max_date].to_json},
+        minDate: #{datepicker_options[:min_date].to_json},
+        monthNames: #{datepicker_options[:month_names].to_json},
+        monthNamesShort: #{datepicker_options[:month_names_short].to_json},
+        navigationAsDateFormat: #{datepicker_options[:navigation_as_date_format].to_json},
+        nextText: #{datepicker_options[:next_text].to_json},
+        numberOfMonths: #{datepicker_options[:number_of_months].to_json},
+        prevText: #{datepicker_options[:prev_text].to_json},
+        selectOtherMonths: #{datepicker_options[:select_other_months].to_json},
+        shortYearCutoff: #{datepicker_options[:short_year_cutoff].to_json},
+        showButtonPanel: #{datepicker_options[:show_button_panel].to_json},
+        showCurrentAtPos: #{datepicker_options[:show_current_at_pos].to_json},
+        showMonthAfterYear: #{datepicker_options[:show_month_after_year].to_json},
+        showOn: #{datepicker_options[:show_on].to_json},
+        showOptions: #{datepicker_options[:show_options].to_json},
+        showOtherMonths: #{datepicker_options[:show_other_months].to_json},
+        showWeek: #{datepicker_options[:show_week].to_json},
+        stepMonths: #{datepicker_options[:step_months].to_json},
+        weekHeader: #{datepicker_options[:week_header].to_json},
+        yearRange: #{datepicker_options[:year_range].to_json},
+        yearSuffix: #{datepicker_options[:year_suffix].to_json}
+      })
+    </script>
+    "
+    result
+  end
+
+  def date_range_field(from_name, to_name, from_value, to_value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
+    from_id = html_options[:from_id] || 'datepicker-from-date'
+    to_id = html_options[:to_id] || 'datepicker-to-date'
+    return _('From') +' '+ date_field(from_name, from_value, format, datepicker_options, html_options.merge({:id => from_id})) +
+    ' ' + _('until') +' '+ date_field(to_name, to_value, format, datepicker_options, html_options.merge({:id => to_id}))
+  end
+
 protected
   def self.next_id_number
     if defined? @@id_num
@@ -31,7 +31,7 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
-  belongs_to :requestor, :class_name => 'Person', :foreign_key => :requestor_id
+  belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
  
   validates_uniqueness_of :code, :on => :create
@@ -2,7 +2,8 @@
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
-'add-and-join', 'report-abuse', 'catalog', 'manage-products', :cache => 'cache-general' %>
+'add-and-join', 'report-abuse', 'catalog', 'manage-products',
+'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
  
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -50,13 +50,13 @@
   <% fields_for "tasks[#{task.id}][task]", task do |f| %>
     <% if task.accept_details %>
       <div id="on-accept-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_task_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
  
     <% if task.reject_details %>
       <div id="on-reject-information-<%=task.id%>" style="display: none">
-        <%= render :partial => partial_for_task_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
+        <%= render :partial => partial_for_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
   <% end %>
@@ -0,0 +1,145 @@
+class CustomFormsPluginMyprofileController < MyProfileController
+  def index
+    @forms = CustomFormsPlugin::Form.from(profile)
+  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')
+      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)
+        session['notice'] = _('Form could not be updated')
+      end
+    end
+  end
+
+  def remove
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    begin
+      @form.destroy
+      session[:notice] = _('Form removed')
+    rescue
+      session[:notice] = _('Form could not be removed')
+    end
+    redirect_to :action => 'index'
+  end
+
+  def submissions
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    @submissions = @form.submissions
+  end
+
+  def show_submission
+    @submission = CustomFormsPlugin::Submission.find(params[:id])
+    @form = @submission.form
+  end
+
+  private
+
+  def new_fields(params)
+    result = params[:fields].map {|id, hash| hash.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 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
+  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
+
+  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
+    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)
+      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
@@ -0,0 +1,45 @@
+class CustomFormsPluginProfileController < ProfileController
+
+  before_filter :has_access, :show
+
+  def show
+    @form = CustomFormsPlugin::Form.find(params[:id])
+    if user
+      @submission ||= CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
+      @submission ||= CustomFormsPlugin::Submission.new(:form_id => @form.id, :profile_id => user.id)
+    else
+      @submission ||= CustomFormsPlugin::Submission.new(:form_id => @form.id)
+    end
+    if request.post?
+      begin
+        extend(CustomFormsPlugin::Helper)
+        answers = build_answers(params[:submission], @form)
+        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]
+          end
+          @submission.save!
+          answers.map {|answer| answer.submission = @submission; answer.save!}
+        else
+          @submission.valid?
+          failed_answers.each do |answer|
+            @submission.errors.add(answer.field.name.to_sym, answer.errors[answer.field.slug.to_sym])
+          end
+        end
+        session[:notice] = _('Submission saved')
+        redirect_to :action => 'show'
+      rescue
+        session[:notice] = _('Submission could not be saved')
+      end
+    end
+  end
+
+  private
+
+  def has_access
+    form = CustomFormsPlugin::Form.find(params[:id])
+    render_access_denied if !form.accessible_to(user)
+  end
+end
@@ -0,0 +1,20 @@
+class CreateCustomFormsPluginForms < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_forms do |t|
+      t.string :name
+      t.string :slug
+      t.text :description
+      t.references :profile
+      t.datetime :begining
+      t.datetime :ending
+      t.boolean :report_submissions, :default => false
+      t.boolean :on_membership, :default => false
+      t.string :access
+      t.timestamps
+    end 
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_forms
+  end
+end
@@ -0,0 +1,21 @@
+class CreateCustomFormsPluginFields < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_fields do |t|
+      t.string :name
+      t.string :slug
+      t.string :type
+      t.string :default_value
+      t.string :choices
+      t.float  :minimum
+      t.float  :maximum
+      t.references :form
+      t.boolean :mandatory, :default => false
+      t.boolean :multiple
+      t.boolean :list
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_fields
+  end
+end
@@ -0,0 +1,13 @@
+class CreateCustomFormsPluginAnswers < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_answers do |t|
+      t.text :value
+      t.references :field
+      t.references :submission
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_answers
+  end
+end
@@ -0,0 +1,15 @@
+class CreateCustomFormsPluginSubmissions < ActiveRecord::Migration
+  def self.up
+    create_table :custom_forms_plugin_submissions do |t|
+      t.string :author_name
+      t.string :author_email
+      t.references :profile
+      t.references :form
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :custom_forms_plugin_submissions
+  end
+end
@@ -0,0 +1,21 @@
+require 'ext/role_assignment_trigger'
+
+class CustomFormsPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Custom Forms"
+  end
+
+  def self.plugin_description
+    _("Enables the creation of forms.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def control_panel_buttons
+    {:title => _('Manage Forms'), :icon => 'custom-forms', :url => {:controller => 'custom_forms_plugin_myprofile'}}
+  end
+
+end
@@ -0,0 +1,14 @@
+class CustomFormsPlugin::Answer < Noosfero::Plugin::ActiveRecord
+  belongs_to :field, :class_name => 'CustomFormsPlugin::Field'
+  belongs_to :submission, :class_name => 'CustomFormsPlugin::Submission'
+
+  validates_presence_of :field
+  validate :value_mandatory, :if => 'field.present?'
+
+  def value_mandatory
+    if field.mandatory && value.blank?
+      errors.add(field.slug.to_sym, _("is mandatory.").fix_i18n)
+    end
+  end
+end
+
@@ -0,0 +1,16 @@
+class CustomFormsPlugin::Field < ActiveRecord::Base
+  set_table_name :custom_forms_plugin_fields
+
+  validates_presence_of :form, :name
+  validates_uniqueness_of :slug, :scope => :form_id
+
+  belongs_to :form, :class_name => 'CustomFormsPlugin::Form', :dependent => :destroy
+  has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
+
+  serialize :choices, Hash
+
+  before_validation do |field|
+    field.slug = field.name.to_slug if field.name.present?
+  end
+end
+
@@ -0,0 +1,70 @@
+class CustomFormsPlugin::Form < Noosfero::Plugin::ActiveRecord
+  belongs_to :profile
+
+  has_many :fields, :class_name => 'CustomFormsPlugin::Field'
+  has_many :submissions, :class_name => 'CustomFormsPlugin::Submission'
+
+  serialize :access
+
+  validates_presence_of :profile, :name
+  validates_uniqueness_of :slug, :scope => :profile_id
+  validate :access_format
+
+  before_validation do |form|
+    form.slug = form.name.to_slug if form.name.present?
+    form.access = nil if form.access.blank?
+  end
+
+  named_scope :from, lambda {|profile| {:conditions => {:profile_id => profile.id}}}
+  named_scope :on_memberships, {:conditions => {:on_membership => true}}
+=begin
+  named_scope :accessible_to lambda do |profile| 
+    #TODO should verify is profile is associated with the form owner
+    profile_associated = ???
+    {:conditions => ["
+      access IS NULL OR
+      (access='logged' AND :profile_present) OR
+      (access='associated' AND :profile_associated) OR
+      :profile_id in access
+    ", {:profile_present => profile.present?, :profile_associated => ???, :profile_id => profile.id}]}
+  end
+=end
+
+  def expired?
+    (begining.present? && Time.now < begining) || (ending.present? && Time.now > ending)
+  end
+
+  def accessible_to(target)
+    return true if access.nil? || target == profile
+    return false if target.nil?
+    return true if access == 'logged'
+    return true if access == 'associated' && ((profile.organization? && profile.members.include?(target)) || (profile.person? && profile.friends.include?(target)))
+    return true if access.kind_of?(Integer) && target.id == access
+    return true if access.kind_of?(Array) && access.include?(target.id)
+  end
+
+  private
+
+  def access_format
+    if access.present?
+      if access.kind_of?(String)
+        if access != 'logged' && access != 'associated'
+          errors.add(:access, _('Invalid string format of access.'))
+        end
+      elsif access.kind_of?(Integer)
+        if !Profile.exists?(access)
+          errors.add(:access, _('There is no profile with the provided id.'))
+        end
+      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.')) 
+            break
+          end
+        end
+      else
+        errors.add(:access, _('Invalid type format of access.'))
+      end
+    end
+  end
+end
@@ -0,0 +1,119 @@
+module CustomFormsPlugin::Helper
+  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 _('Friends') if form.profile.person?
+    end
+    return _('Custom')
+  end
+
+  def period_range(form)
+    if form.begining.blank? && form.ending.blank?
+      _('Always')
+    elsif form.begining.present? && form.ending.blank?
+      ('From %s') % time_format(form.begining)
+    elsif form.begining.blank? && form.ending.present?
+      _('Until %s') % time_format(form.ending)
+    elsif form.begining.present? && form.ending.present?
+      _('From %s until %s') % [time_format(form.begining), time_format(form.ending)]
+    end
+  end
+
+  def time_format(time)
+    minutes = (time.min == 0) ? '' : ':%M'
+    hour = (time.hour == 0 && minutes.blank?) ? '' : ' %H'
+    h = hour.blank? ? '' : 'h'
+    time.strftime("%Y-%m-%d#{hour+minutes+h}")
+  end
+
+  # TODO add the custom option that should offer the user the hability to
+  # choose the profiles one by one, using something like tokeninput
+  def access_options(profile)
+    associated = profile.organization? ? _('Members') : _('Friends')
+    [
+      [_('Public'), nil         ],
+      [_('Logged users'), 'logged'    ],
+      [ associated, 'associated'],
+    ]
+  end
+
+  def type_options
+    [
+      [_('Text'),   'text_field'  ],
+      [_('Select'), 'select_field']
+    ]
+  end
+
+  def type_to_label(type)
+    map = {
+      'text_field' => _('Text'),
+      'select_field' => _('Select')
+    }
+    map[type_for_options(type)]
+  end
+
+  def type_for_options(type)
+    type.to_s.split(':').last.underscore
+  end
+
+  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?
+      required(labelled_form_field(field.name, field_tag))
+    else 
+      labelled_form_field(field.name, field_tag)
+    end
+  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?)
+  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?
+      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?
+      end.join("\n")
+    end
+  end
+
+  def radio_button?(field)
+    type_for_options(field.class) == 'select_field' && !field.list && !field.multiple
+  end
+
+  def check_box?(field)
+    type_for_options(field.class) == 'select_field' && !field.list && field.multiple
+  end
+
+  def build_answers(submission, form)
+    answers = []
+    submission.each do |slug, value|
+      field = form.fields.select {|field| field.slug==slug}.first
+      if value.kind_of?(String)
+        final_value = value
+      elsif value.kind_of?(Array)
+        final_value = value.join(',')
+      elsif value.kind_of?(Hash)
+        final_value = value.map {|option, present| present == '1' ? option : nil}.compact.join(',')
+      end
+      answers << CustomFormsPlugin::Answer.new(:field => field, :value => final_value)
+    end
+    answers
+  end
+end
@@ -0,0 +1,47 @@
+class CustomFormsPlugin::MembershipSurvey < Task
+
+  settings_items :form_id, :submission
+  validates_presence_of :form_id
+
+  include CustomFormsPlugin::Helper
+
+  def perform
+    form = CustomFormsPlugin::Form.find(form_id)
+    answers = build_answers(submission, form)
+    s = CustomFormsPlugin::Submission.create!(:form => form, :profile => target)
+    answers.map {|answer| answer.submission = s; answer.save!}
+  end
+
+  def title
+    _("Membership survey")
+  end
+
+  def subject
+    nil
+  end
+
+  def linked_subject
+    nil
+  end
+
+  def information
+    {:message => _('%{requestor} wants you to fill in some information.')}
+  end
+
+  def accept_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
+  def target_notification_message
+    _('After 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 to fill in some further information.') % {:requestor => requestor.name}
+  end
+end
@@ -0,0 +1,4 @@
+class CustomFormsPlugin::Numeric < CustomFormsPlugin::Field
+  set_table_name :custom_forms_plugin_fields
+end
+
@@ -0,0 +1,4 @@
+class CustomFormsPlugin::SelectField < CustomFormsPlugin::Field
+  set_table_name :custom_forms_plugin_fields
+  validates_presence_of :choices
+end
@@ -0,0 +1,12 @@
+class CustomFormsPlugin::Submission < Noosfero::Plugin::ActiveRecord
+  belongs_to :form, :class_name => 'CustomFormsPlugin::Form'
+  belongs_to :profile
+
+  has_many :answers, :class_name => 'CustomFormsPlugin::Answer'
+
+  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?})
+end
+
@@ -0,0 +1,3 @@
+class CustomFormsPlugin::TextField < CustomFormsPlugin::Field
+  set_table_name :custom_forms_plugin_fields
+end
@@ -0,0 +1,30 @@
+module RoleAssignmentTrigger
+  def self.included(base)
+    base.class_eval do
+      before_create do |ra|
+        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).on_memberships.each do |form|
+            CustomFormsPlugin::MembershipSurvey.create!(:requestor => profile, :target => person, :form_id => form.id)
+          end
+        end
+      end
+  
+      after_destroy do |ra|
+        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).on_memberships.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
+  end
+end
+
+RoleAssignment.send :include, RoleAssignmentTrigger
@@ -0,0 +1,141 @@
+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
+      jQuery(selector).show();
+      return selector
+    }
+  });
+  return false;
+});
+
+jQuery('.remove-field').live('click', function(){
+  id = jQuery(this).attr('field_id');
+  jQuery('#field-'+id).slideDown(function(){
+    jQuery('#field-'+id).remove();
+  });
+  return false
+});
+
+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
+});
+
+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));
+}
+
+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);
+}
+
+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);
+}
+
+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);
+
+  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');
+
+  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');
+}
+
+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
+});
+
+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
+});
+
+jQuery('.colorbox-ok-button').live('click', function(){
+  jQuery('#'+jQuery(this).attr('div_id')).hide();
+  jQuery.colorbox.close();
+  return false
+});
@@ -0,0 +1,30 @@
+.controller-profile_editor a.control-panel-custom-forms,
+.controller-profile_editor .msie6 a.control-panel-custom-forms {
+  background-image: url(/plugins/custom_forms/icons/custom-forms.png)
+}
+
+.action-table {
+  width: 100%; 
+  overflow: hidden;
+}
+
+.action-table th,
+.action-table td{
+  text-align: center;
+}
+
+.action-table td{
+  cursor: move;
+}
+
+.action-table .actions{
+  white-space: nowrap;
+}
+
+.action-table .new-item{
+  background-color: #EEE;
+}
+
+.edit-information {
+  display: none;
+}
@@ -0,0 +1,114 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/custom_forms_plugin_myprofile_controller'
+
+# Re-raise errors caught by the controller.
+class CustomFormsPluginMyprofileController; def rescue_action(e) raise e end; end
+
+class CustomFormsPluginMyprofileControllerTest < ActionController::TestCase
+  def setup
+    @controller = CustomFormsPluginMyprofileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @profile = create_user('profile').person
+    login_as(@profile.identifier)
+    environment = Environment.default
+    environment.enable_plugin(CustomFormsPlugin)
+  end
+
+  attr_reader :profile
+
+  should 'list forms associated with profile' do
+    another_profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    f2 = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Open Source')
+    f3 = CustomFormsPlugin::Form.create!(:profile => another_profile, :name => 'Open Source')
+
+    get :index, :profile => profile.identifier
+
+    assert_includes assigns(:forms), f1
+    assert_includes assigns(:forms), f2
+    assert_not_includes assigns(:forms), f3
+  end
+
+  should 'destroy form' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    assert CustomFormsPlugin::Form.exists?(form.id)
+    post :remove, :profile => profile.identifier, :id => form.id
+    assert !CustomFormsPlugin::Form.exists?(form.id)
+  end
+
+  should 'create a form' do
+    format = '%Y-%m-%d %H:%M'
+    begining = Time.now.strftime(format)
+    ending = (Time.now + 1.day).strftime('%Y-%m-%d %H:%M')
+    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 => {
+          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'}
+            }
+          }
+        }
+    end
+
+    form = CustomFormsPlugin::Form.find_by_name('My Form')
+    assert_equal 'logged', form.access
+    assert_equal begining, form.begining.strftime(format)
+    assert_equal ending, form.ending.strftime(format)
+    assert_equal 'Cool form', form.description
+    assert_equal 2, form.fields.count
+
+    f1 = form.fields.first
+    f2 = form.fields.last
+
+    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 f2.kind_of?(CustomFormsPlugin::SelectField)
+  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('%Y-%m-%d %H:%M')
+
+    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'}}
+
+    form.reload
+    field.reload
+
+    assert_equal 'logged', form.access
+    assert_equal begining, form.begining.strftime(format)
+    assert_equal ending, form.ending.strftime(format)
+    assert_equal 'Cool form', form.description
+    assert_equal 'Source', field.name
+  end
+end
+
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::AnswerTest < ActiveSupport::TestCase
+  should 'validates presence of field' do
+    answer = CustomFormsPlugin::Answer.new
+    answer.valid?
+    assert answer.errors.invalid?(:field)
+
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    answer.field = field
+    answer.valid?
+    assert !answer.errors.invalid?(:field)
+  end
+
+  should 'belong to a submission' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    answer = CustomFormsPlugin::Answer.new
+    answer.submission = submission
+
+    assert_equal submission, answer.submission
+  end
+
+  should 'require presence of value if field is mandatory' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    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)
+
+    answer.value = "GPL"
+    answer.valid?
+    assert !answer.errors.invalid?(field.slug.to_sym)
+  end
+
+end
+
@@ -0,0 +1,64 @@
+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
+  end
+
+  should 'have answers' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    a1 = CustomFormsPlugin::Answer.create!(:field => field)
+    a2 = CustomFormsPlugin::Answer.create!(:field => field)
+
+    assert_includes field.answers, a1
+    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
+end
+
@@ -0,0 +1,172 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::FormTest < ActiveSupport::TestCase
+  should 'validates presence of a profile and a name' do
+    form = CustomFormsPlugin::Form.new
+    form.valid?
+    assert form.errors.invalid?(:profile)
+    assert form.errors.invalid?(:name)
+
+    form.profile = fast_create(Profile)
+    form.name = 'Free Software'
+    form.valid?
+    assert !form.errors.invalid?(:profile)
+    assert !form.errors.invalid?(:name)
+  end
+
+  should 'have many fields including fields subclasses' do
+    form = CustomFormsPlugin::Form.create!(:profile => fast_create(Profile), :name => 'Free Software')
+    f1 = CustomFormsPlugin::Field.create!(:form => form, :name => 'License')
+    f2 = CustomFormsPlugin::Field.create!(:form => form, :name => 'Code')
+    f3 = CustomFormsPlugin::TextField.create!(:form => form, :name => 'Developer')
+
+    assert_includes form.fields, f1
+    assert_includes form.fields, f2
+    assert_includes form.fields, f3
+  end
+
+  should 'have many submissions' do
+    form = CustomFormsPlugin::Form.create!(:profile => fast_create(Profile), :name => 'Free Software')
+    s1 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    s2 = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+
+    assert_includes form.submissions, s1
+    assert_includes form.submissions, s2
+  end
+
+  should 'set slug before validation based on name' do
+    form = CustomFormsPlugin::Form.new(:name => 'Name')
+    form.valid?
+    assert_equal form.name.to_slug, form.slug
+  end
+
+  should 'validates uniqueness of slug scoped on profile' do
+    profile = fast_create(Profile)
+    another_profile = fast_create(Profile)
+    CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    form = CustomFormsPlugin::Form.new(:profile => profile, :name => 'Free Software')
+    form.valid?
+    assert form.errors.invalid?(:slug)
+
+    form.profile = another_profile
+    form.valid?
+    assert !form.errors.invalid?(:slug)
+  end
+
+  should 'define form expiration' do
+    form = CustomFormsPlugin::Form.new
+    assert !form.expired?
+
+    form.begining = Time.now + 1.day
+    assert form.expired?
+
+    form.begining = Time.now - 1.day
+    assert !form.expired?
+
+    form.begining = nil
+    form.ending = Time.now + 1.day
+    assert !form.expired?
+
+    form.ending = Time.now - 1.day
+    assert form.expired?
+
+    form.begining = Time.now - 1.day
+    form.ending = Time.now + 1.day
+    assert !form.expired?
+  end
+
+  should 'validates format of access' do
+    form = CustomFormsPlugin::Form.new
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    form.access = 'bli'
+    form.valid?
+    assert form.errors.invalid?(:access)
+
+    form.access = 'logged'
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    form.access = 'associated'
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    form.access = {:bli => 1}
+    form.valid?
+    assert form.errors.invalid?(:access)
+
+    form.access = 999
+    form.valid?
+    assert form.errors.invalid?(:access)
+
+    p1 = fast_create(Profile)
+    form.access = p1.id
+    form.valid?
+    assert !form.errors.invalid?(:access)
+
+    p2 = fast_create(Profile)
+    p3 = fast_create(Profile)
+    form.access = [p1,p2,p3].map(&:id)
+    form.valid?
+    assert !form.errors.invalid?(:access)
+  end
+
+  should 'defines who is able to access the form' do
+    owner = fast_create(Community)
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => owner)
+    assert form.accessible_to(nil)
+
+    form.access = 'logged'
+    assert !form.accessible_to(nil)
+    person = fast_create(Person)
+    assert form.accessible_to(person)
+
+    form.access = 'associated'
+    assert !form.accessible_to(person)
+    owner.add_member(person)
+    assert form.accessible_to(person)
+
+    p1 = fast_create(Profile)
+    form.access = p1.id
+    assert !form.accessible_to(person)
+    assert form.accessible_to(p1)
+
+    p2 = fast_create(Profile)
+    form.access = [person.id, p1.id]
+    assert form.accessible_to(person)
+    assert form.accessible_to(p1)
+    assert !form.accessible_to(p2)
+    form.access << p2.id
+    assert form.accessible_to(p2)
+
+    assert form.accessible_to(owner)
+  end
+
+  should 'have a named_scope that retrieve forms from a profile' do
+    profile = fast_create(Profile)
+    another_profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => profile)
+    f2 = CustomFormsPlugin::Form.create!(:name => 'Open Source', :profile => profile)
+    f3 = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => another_profile)
+    scope = CustomFormsPlugin::Form.from(profile)
+
+    assert_equal ActiveRecord::NamedScope::Scope, scope.class
+    assert_includes scope, f1
+    assert_includes scope, f2
+    assert_not_includes scope, f3
+  end
+
+  should 'have a named_scope that retrieves all forms that are triggered on membership' do
+    profile = fast_create(Profile)
+    f1 = CustomFormsPlugin::Form.create!(:name => 'On membership 1', :profile => profile, :on_membership => true)
+    f2 = CustomFormsPlugin::Form.create!(:name => 'On membership 2', :profile => profile, :on_membership => true)
+    f3 = CustomFormsPlugin::Form.create!(:name => 'Not on memberhsip', :profile => profile, :on_membership => false)
+    scope = CustomFormsPlugin::Form.from(profile).on_memberships
+
+    assert_equal ActiveRecord::NamedScope::Scope, scope.class
+    assert_includes scope, f1
+    assert_includes scope, f2
+    assert_not_includes scope, f3
+  end
+end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::MembershipSurveyTest < ActiveSupport::TestCase
+  should 'validates presence of form_id' do
+    task = CustomFormsPlugin::MembershipSurvey.new
+    task.valid?
+    assert task.errors.invalid?(:form_id)
+
+    task.form_id = 1
+    task.valid?
+    assert !task.errors.invalid?(:form_id)
+  end
+
+  should 'create submission with answers on perform' do
+    profile = fast_create(Profile)
+    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)
+
+    assert_difference CustomFormsPlugin::Submission, :count, 1 do
+      task.finish
+    end
+
+    submission = CustomFormsPlugin::Submission.last
+    assert_equal submission.answers.count, 1 
+
+    answer = submission.answers.first
+    assert_equal answer.value, 'Jack'
+  end
+end
@@ -0,0 +1,13 @@
+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)
+  end
+end
@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CustomFormsPlugin::SubmissionTest < ActiveSupport::TestCase
+  should 'validates presence of form' do
+    submission = CustomFormsPlugin::Submission.new
+    submission.valid?
+    assert submission.errors.invalid?(:form)
+
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    submission.form = form
+    submission.valid?
+    assert !submission.errors.invalid?(:form)
+  end
+
+  should 'belong to a profile' do
+    profile = fast_create(Profile)
+    submission = CustomFormsPlugin::Submission.new
+    submission.profile = profile
+    assert_equal profile, submission.profile
+  end
+
+  should 'require presence of author name and email if profile is nil' do
+    submission = CustomFormsPlugin::Submission.new
+    submission.valid?
+    assert submission.errors.invalid?(:author_name)
+    assert submission.errors.invalid?(:author_email)
+
+    submission.author_name = 'Jack Sparrow'
+    submission.author_email = 'jack@black-pearl.com'
+    submission.valid?
+    assert !submission.errors.invalid?(:author_name)
+    assert !submission.errors.invalid?(:author_email)
+  end
+
+  should 'have answers' do
+    form = CustomFormsPlugin::Form.create!(:name => 'Free Software', :profile => fast_create(Profile))
+    field = CustomFormsPlugin::Field.create!(:name => 'License', :form => form)
+    submission = CustomFormsPlugin::Submission.create!(:form => form, :profile => fast_create(Profile))
+    a1 = CustomFormsPlugin::Answer.create!(:field => field, :submission => submission)
+    a2 = CustomFormsPlugin::Answer.create!(:field => field, :submission => submission)
+
+    assert_includes submission.answers, a1
+    assert_includes submission.answers, a2
+  end
+end
+
@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class RoleAssignmentsTest < ActiveSupport::TestCase
+  should 'create membership_surveys on membership creation' 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', :on_membership => true)
+    f2 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 2', :on_membership => true)
+    f3 = CustomFormsPlugin::Form.create!(:profile => organization, :name => 'Form 3', :on_membership => false)
+
+    assert_difference CustomFormsPlugin::MembershipSurvey, :count, 2 do
+      organization.add_member(person)
+    end
+  end
+
+  should 'create membership_survey on membership creation with form accessible to members only' 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, :access => 'associated')
+
+    assert_difference CustomFormsPlugin::MembershipSurvey, :count, 1 do
+      organization.add_member(person)
+    end
+  end
+
+  should 'cancel membership_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)
+    organization.add_member(person)
+
+    assert_difference CustomFormsPlugin::MembershipSurvey.pending, :count, -1 do
+      organization.remove_member(person)
+    end
+
+    organization.add_member(person)
+    task = CustomFormsPlugin::MembershipSurvey.last
+    task.status = Task::Status::FINISHED
+    task.save!
+    assert_no_difference CustomFormsPlugin::MembershipSurvey.finished, :count do
+      organization.remove_member(person)
+    end
+  end
+end
+
@@ -0,0 +1,33 @@
+<% elem_id = "edit-select-#{counter}" %>
+<div id=<%= elem_id %> class='edit-information'>
+  <h1><%= _('Options') %></h1>
+  <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>
+    </tr>
+    <% option_counter = 1 %>
+    <% (field.choices || {}).each do |name, value| %>
+      <%= render :partial => 'option', :locals => {:name => name, :value => value, :counter => counter, :option_counter => option_counter} %>
+      <% option_counter += 1 %>
+    <% end %>
+    <%= render :partial => 'empty_option', :locals => {:counter => counter, :option_counter => option_counter} %>
+    <tr class='new-item'>
+      <td colspan='3'><strong><%= link_to(_('NEW OPTION'), '#', :class => 'new-option', :field_id => counter)%></strong></td>
+    </tr>
+  </table>
+
+  <h2><%= _('Type') %></h2>
+  <%#= labelled_check_box _('List'), "fields[#{counter}][list]", true, field.list %>
+  <%#= labelled_check_box _('Multiple'), "fields[#{counter}][multiple]", true, field.multiple %>
+  <%= labelled_radio_button 'Radio', "fields[#{counter}][kind]", 'radio', !field.multiple && !field.list %><br />
+  <%= labelled_radio_button 'Check Box', "fields[#{counter}][kind]", 'check_box', field.multiple && !field.list %><br />
+  <%= labelled_radio_button 'Select', "fields[#{counter}][kind]", 'select', !field.multiple && field.list %><br />
+  <%= labelled_radio_button 'Multiple Select', "fields[#{counter}][kind]", 'multiple_select', field.multiple && field.list %><br />
+
+  <% button_bar do %>
+    <%= button :ok, _('Ok'), '#', :class => 'colorbox-ok-button', :div_id => elem_id %>
+  <% end %>
+</div>
+
@@ -0,0 +1,9 @@
+<% elem_id = "edit-text-#{counter}" %>
+<div id=<%= elem_id %> class='edit-information'>
+  <%= 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>
+
@@ -0,0 +1,10 @@
+<tr id="empty-field" style='display: none' last_id=<%= counter %>>
+  <td style="text-align: left"><%= text_field "fields[#{counter}]", :name %></td>
+  <td><%= select "fields[#{counter}]", :type, type_options, :selected => type_for_options(field.class) %></td>
+  <td><%= check_box "fields[#{counter}]", :mandatory %></td>
+  <%= 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>
@@ -0,0 +1,8 @@
+<tr id=<%= "empty-option-#{counter}" %> option_id=<%= option_counter %> style="display: none;">
+  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][name]") %></td>
+  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][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>
+
@@ -0,0 +1,12 @@
+<tr id=<%= "field-#{counter}" %>>
+  <td style="text-align: left"><%= text_field "fields[#{counter}]", :name, :value => field.name %></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>
@@ -0,0 +1,54 @@
+<% self.extend(CustomFormsPlugin::Helper) %>
+
+<%= error_messages_for :form %>
+
+<% form_for :form, @form do |f| %>
+  <%= required labelled_form_field _('Name'), f.text_field(:name) %>
+  <%= labelled_form_field(_('Período'), (
+    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%') %>
+
+  <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'><strong><%= link_to(_('NEW FIELD'), '#', :id => 'new-field')%></strong></td>
+    </tr>
+  </table>
+
+  <% 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 %>
+  <% end %>
+
+  <%= render :partial => 'edit_text', :locals => {:field => @empty_field, :counter => counter} %>
+  <%= render :partial => 'edit_select', :locals => {:field => @empty_field, :counter => counter} %>
+
+  <% button_bar do %>
+    <%= submit_button :save, _('Save'), :cancel => {:action => 'index'}%>
+  <% end %>
+<% end %>
+
+<%= javascript_include_tag '../plugins/custom_forms/field' %>
@@ -0,0 +1,7 @@
+<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>
@@ -0,0 +1,2 @@
+<h1><%= _('New form') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,2 @@
+<h1><%= _('Edit form') %></h1>
+<%= render :partial => 'form' %>
@@ -0,0 +1,26 @@
+<% self.extend CustomFormsPlugin::Helper %>
+
+<h1><%= _('Manage forms') %></h1>
+<table class="action-table">
+  <tr>
+    <th style='width: 40%'><%= _('Name') %></th>
+    <th style='width: 30%'><%= _('Period') %></th>
+    <th style='width: 10%'><%= _('Submissions') %></th>
+    <th style='width: 10%'><%= _('Access') %></th>
+    <th style='width: 10%'><%= _('Actions') %></th>
+  </tr>
+  <% @forms.each do |form| %>
+    <tr>
+      <td><%= form.name %></td>
+      <td><%= period_range(form) %></td>
+      <td><%= form.submissions.count > 0 ? link_to(form.submissions.count, {:action => 'submissions', :id => form.id}) : 0 %></td>
+      <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>
+    </tr>
+  <% end %>
+  <tr id="new-item">
+    <td colspan='5'><strong><%= link_to(_('NEW FORM'), :action => 'create')%></strong></td>
+  </tr>
+</table>
@@ -0,0 +1,10 @@
+<h1><%= @form.name %></h1>
+<p><%= @form.description %></p>
+
+<% fields_for :submission, @submission do |f| %>
+  <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to submissions'), :action => 'submissions', :id => @form.id %>
+<% end %>
@@ -0,0 +1,25 @@
+<% self.extend CustomFormsPlugin::Helper %>
+
+<h1><%= _('Submissions for %s') % @form.name %></h1>
+
+<% if @form.submissions.empty? %>
+  <%= _('There are no submissions for this form.') %>
+<% else %>
+  <table class="action-table">
+    <tr>
+      <th style='width: 50%'><%= _('Author') %></th>
+      <th style='width: 50%'><%= _('Time') %></th>
+    </tr>
+    <% @submissions.each do |submission| %>
+      <tr>
+        <% author = submission.profile.present? ? submission.profile.name : submission.author_name %>
+        <td><%= link_to(author, {:action => 'show_submission', :id => submission.id}) %></td>
+        <td><%= time_format(submission.created_at) %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
+<% button_bar do %>
+  <%= button :back, _('Back to forms'), :action => 'index' %>
+<% end %>
@@ -0,0 +1,23 @@
+<h1><%= @form.name %></h1>
+<p><%= @form.description %></p>
+
+<% if @submission.id.nil? %>
+  <%= error_messages_for :submission %>
+
+  <% form_for :submission, @submission do |f| %>
+    <% if !user %>
+      <%= required labelled_form_field _('Author name'), text_field_tag(:author_name, @submission.author_name) %>
+      <%= required labelled_form_field _('Author email'), text_field_tag(:author_email, @submission.author_email) %>
+    <% end %>
+
+    <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
+
+    <% button_bar do %>
+      <%= submit_button :save, _('Save'), :cancel => {:action => 'index'} %>
+    <% end %>
+  <% end %>
+<% else %>
+  <% fields_for :submission, @submission do |f| %>
+    <%= render :partial => 'shared/form_submission', :locals => {:f => f} %>
+  <% end %>
+<% end %>
@@ -0,0 +1,5 @@
+<% self.extend(CustomFormsPlugin::Helper) %>
+
+<% @form.fields.each do |field| %>
+  <%= display_custom_field(field, @submission, f.object_name) %>
+<% end %>
@@ -0,0 +1 @@
+<%= f.object_name.to_s %>
@@ -0,0 +1,10 @@
+<% @form = CustomFormsPlugin::Form.find(task.form_id) %>
+<% @submission = CustomFormsPlugin::Submission.new(:form_id => @form.id, :profile_id => user.id) %>
+
+<h2><%= @form.name %></h2>
+<p><%= @form.description %></p>
+
+<% f.fields_for :submission do |fi| %>
+  <%#= fi.error_messages_for :submission %>
+  <%= render :partial => 'shared/form_submission', :locals => {:f => fi} %>
+<% end %>
@@ -0,0 +1,1530 @@
+/*
+* jQuery timepicker addon
+* By: Trent Richardson [http://trentrichardson.com]
+* Version 1.0.1
+* Last Modified: 07/01/2012
+*
+* Copyright 2012 Trent Richardson
+* You may use this project under MIT or GPL licenses.
+* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+*
+* HERES THE CSS:
+* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+* .ui-timepicker-div dl { text-align: left; }
+* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+* .ui-timepicker-div td { font-size: 90%; }
+* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+*/
+
+/*jslint evil: true, maxlen: 300, white: false, undef: false, nomen: false, onevar: false */
+
+(function($) {
+
+// Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+$.ui.timepicker = $.ui.timepicker || {};
+if ($.ui.timepicker.version) {
+	return;
+}
+
+$.extend($.ui, { timepicker: { version: "1.0.1" } });
+
+/* Time picker manager.
+   Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+   Settings for (groups of) time pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Timepicker() {
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		currentText: 'Now',
+		closeText: 'Done',
+		ampm: false,
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		timeFormat: 'hh:mm tt',
+		timeSuffix: '',
+		timeOnlyTitle: 'Choose Time',
+		timeText: 'Time',
+		hourText: 'Hour',
+		minuteText: 'Minute',
+		secondText: 'Second',
+		millisecText: 'Millisecond',
+		timezoneText: 'Time Zone'
+	};
+	this._defaults = { // Global defaults for all the datetime picker instances
+		showButtonPanel: true,
+		timeOnly: false,
+		showHour: true,
+		showMinute: true,
+		showSecond: false,
+		showMillisec: false,
+		showTimezone: false,
+		showTime: true,
+		stepHour: 1,
+		stepMinute: 1,
+		stepSecond: 1,
+		stepMillisec: 1,
+		hour: 0,
+		minute: 0,
+		second: 0,
+		millisec: 0,
+		timezone: null,
+		useLocalTimezone: false,
+		defaultTimezone: "+0000",
+		hourMin: 0,
+		minuteMin: 0,
+		secondMin: 0,
+		millisecMin: 0,
+		hourMax: 23,
+		minuteMax: 59,
+		secondMax: 59,
+		millisecMax: 999,
+		minDateTime: null,
+		maxDateTime: null,
+		onSelect: null,
+		hourGrid: 0,
+		minuteGrid: 0,
+		secondGrid: 0,
+		millisecGrid: 0,
+		alwaysSetTime: true,
+		separator: ' ',
+		altFieldTimeOnly: true,
+		showTimepicker: true,
+		timezoneIso8601: false,
+		timezoneList: null,
+		addSliderAccess: false,
+		sliderAccessArgs: null
+	};
+	$.extend(this._defaults, this.regional['']);
+}
+
+$.extend(Timepicker.prototype, {
+	$input: null,
+	$altInput: null,
+	$timeObj: null,
+	inst: null,
+	hour_slider: null,
+	minute_slider: null,
+	second_slider: null,
+	millisec_slider: null,
+	timezone_select: null,
+	hour: 0,
+	minute: 0,
+	second: 0,
+	millisec: 0,
+	timezone: null,
+	defaultTimezone: "+0000",
+	hourMinOriginal: null,
+	minuteMinOriginal: null,
+	secondMinOriginal: null,
+	millisecMinOriginal: null,
+	hourMaxOriginal: null,
+	minuteMaxOriginal: null,
+	secondMaxOriginal: null,
+	millisecMaxOriginal: null,
+	ampm: '',
+	formattedDate: '',
+	formattedTime: '',
+	formattedDateTime: '',
+	timezoneList: null,
+
+	/* Override the default settings for all instances of the time picker.
+	   @param  settings  object - the new settings to use as defaults (anonymous object)
+	   @return the manager object */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	//########################################################################
+	// Create a new Timepicker instance
+	//########################################################################
+	_newInst: function($input, o) {
+		var tp_inst = new Timepicker(),
+			inlineSettings = {};
+
+		for (var attrName in this._defaults) {
+			var attrValue = $input.attr('time:' + attrName);
+			if (attrValue) {
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
+			beforeShow: function(input, dp_inst) {
+				if ($.isFunction(o.beforeShow)) {
+					return o.beforeShow(input, dp_inst, tp_inst);
+                }
+			},
+			onChangeMonthYear: function(year, month, dp_inst) {
+				// Update the time as well : this prevents the time from disappearing from the $input field.
+				tp_inst._updateDateTime(dp_inst);
+				if ($.isFunction(o.onChangeMonthYear)) {
+					o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+                }
+			},
+			onClose: function(dateText, dp_inst) {
+				if (tp_inst.timeDefined === true && $input.val() !== '') {
+					tp_inst._updateDateTime(dp_inst);
+                }
+				if ($.isFunction(o.onClose)) {
+					o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+                }
+			},
+			timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+		});
+		tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase(); });
+		tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase(); });
+
+		if (tp_inst._defaults.timezoneList === null) {
+			var timezoneList = [];
+			for (var i = -11; i <= 12; i++) {
+				timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
+            }
+			if (tp_inst._defaults.timezoneIso8601) {
+				timezoneList = $.map(timezoneList, function(val) {
+					return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
+				});
+            }
+			tp_inst._defaults.timezoneList = timezoneList;
+		}
+
+		tp_inst.timezone = tp_inst._defaults.timezone;
+		tp_inst.hour = tp_inst._defaults.hour;
+		tp_inst.minute = tp_inst._defaults.minute;
+		tp_inst.second = tp_inst._defaults.second;
+		tp_inst.millisec = tp_inst._defaults.millisec;
+		tp_inst.ampm = '';
+		tp_inst.$input = $input;
+
+		if (o.altField) {
+			tp_inst.$altInput = $(o.altField)
+				.css({ cursor: 'pointer' })
+				.focus(function(){ $input.trigger("focus"); });
+        }
+
+		if(tp_inst._defaults.minDate===0 || tp_inst._defaults.minDateTime===0)
+		{
+			tp_inst._defaults.minDate=new Date();
+		}
+		if(tp_inst._defaults.maxDate===0 || tp_inst._defaults.maxDateTime===0)
+		{
+			tp_inst._defaults.maxDate=new Date();
+		}
+
+		// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+		if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+			tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+        }
+		if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+			tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+        }
+		if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+			tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+        }
+		if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+			tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+        }
+		return tp_inst;
+	},
+
+	//########################################################################
+	// add our sliders to the calendar
+	//########################################################################
+	_addTimePicker: function(dp_inst) {
+		var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
+				this.$input.val() + ' ' + this.$altInput.val() :
+				this.$input.val();
+
+		this.timeDefined = this._parseTime(currDT);
+		this._limitMinMaxDateTime(dp_inst, false);
+		this._injectTimePicker();
+	},
+
+	//########################################################################
+	// parse the time string from input value or _setTime
+	//########################################################################
+	_parseTime: function(timeString, withDate) {
+		if (!this.inst) {
+			this.inst = $.datepicker._getInst(this.$input[0]);
+		}
+		
+		if (withDate || !this._defaults.timeOnly) 
+		{
+			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+			try {
+				var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+				if (!parseRes.timeObj) { return false; }
+				$.extend(this, parseRes.timeObj);
+			} catch (err)
+			{
+				return false;
+			}
+			return true;
+		}
+		else
+		{
+			var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+			if(!timeObj) { return false; }
+			$.extend(this, timeObj);
+			return true;
+		}
+	},
+	
+	//########################################################################
+	// generate and inject html for timepicker into ui datepicker
+	//########################################################################
+	_injectTimePicker: function() {
+		var $dp = this.inst.dpDiv,
+			o = this._defaults,
+			tp_inst = this,
+			// Added by Peter Medeiros:
+			// - Figure out what the hour/minute/second max should be based on the step values.
+			// - Example: if stepMinute is 15, then minMax is 45.
+			hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
+			minMax  = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
+			secMax  = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
+			millisecMax  = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
+			dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
+
+		// Prevent displaying twice
+		//if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
+		if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
+			var noDisplay = ' style="display:none;"',
+				html =	'<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' +
+						'<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+						'<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '></dd>' +
+						'<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
+				hourGridSize = 0,
+				minuteGridSize = 0,
+				secondGridSize = 0,
+				millisecGridSize = 0,
+				size = null;
+
+            // Hours
+			html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '></div>';
+			if (o.showHour && o.hourGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) {
+					hourGridSize++;
+					var tmph = (o.ampm && h > 12) ? h-12 : h;
+					if (tmph < 10) { tmph = '0' + tmph; }
+					if (o.ampm) {
+						if (h === 0) {
+                            tmph = 12 +'a';
+                        } else {
+                            if (h < 12) { tmph += 'a'; }
+						    else { tmph += 'p'; }
+                        }
+					}
+					html += '<td>' + tmph + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Minutes
+			html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
+					((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
+					'<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
+							((o.showMinute) ? '' : noDisplay) + '></div>';
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
+					minuteGridSize++;
+					html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Seconds
+			html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
+					((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
+					'<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
+							((o.showSecond) ? '' : noDisplay) + '></div>';
+
+			if (o.showSecond && o.secondGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
+					secondGridSize++;
+					html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Milliseconds
+			html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
+					((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
+					'<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
+							((o.showMillisec) ? '' : noDisplay) + '></div>';
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
+					millisecGridSize++;
+					html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Timezone
+			html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
+					((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+			html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"'	+
+							((o.showTimezone) ? '' : noDisplay) + '></dd>';
+
+			html += '</dl></div>';
+			var $tp = $(html);
+
+				// if we only want time picker...
+			if (o.timeOnly === true) {
+				$tp.prepend(
+					'<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' +
+						'<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
+					'</div>');
+				$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+			}
+
+			this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.hour,
+				min: o.hourMin,
+				max: hourMax,
+				step: o.stepHour,
+				slide: function(event, ui) {
+					tp_inst.hour_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+
+			// Updated by Peter Medeiros:
+			// - Pass in Event and UI instance into slide function
+			this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.minute,
+				min: o.minuteMin,
+				max: minMax,
+				step: o.stepMinute,
+				slide: function(event, ui) {
+					tp_inst.minute_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.second,
+				min: o.secondMin,
+				max: secMax,
+				step: o.stepSecond,
+				slide: function(event, ui) {
+					tp_inst.second_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.millisec,
+				min: o.millisecMin,
+				max: millisecMax,
+				step: o.stepMillisec,
+				slide: function(event, ui) {
+					tp_inst.millisec_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
+			$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function(val, idx) {
+					return $("<option />")
+						.val(typeof val == "object" ? val.value : val)
+						.text(typeof val == "object" ? val.label : val);
+				})
+			);
+			if (typeof(this.timezone) != "undefined" && this.timezone !== null && this.timezone !== "") {
+				var local_date = new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12);
+				var local_timezone = timeZoneString(local_date);
+				if (local_timezone == this.timezone) {
+					selectLocalTimeZone(tp_inst);
+				} else {
+					this.timezone_select.val(this.timezone);
+				}
+			} else {
+				if (typeof(this.hour) != "undefined" && this.hour !== null && this.hour !== "") {
+					this.timezone_select.val(o.defaultTimezone);
+				} else {
+					selectLocalTimeZone(tp_inst);
+				}
+			}
+			this.timezone_select.change(function() {
+				tp_inst._defaults.useLocalTimezone = false;
+				tp_inst._onTimeChange();
+			});
+
+			// Add grid functionality
+			if (o.showHour && o.hourGrid > 0) {
+				size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
+
+				$tp.find(".ui_tpicker_hour table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * hourGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each( function(index) {
+					$(this).click(function() {
+						var h = $(this).html();
+						if(o.ampm)	{
+							var ap = h.substring(2).toLowerCase(),
+								aph = parseInt(h.substring(0,2), 10);
+							if (ap == 'a') {
+								if (aph == 12) { h = 0; }
+								else { h = aph; }
+							} else if (aph == 12) { h = 12; }
+							else { h = aph + 12; }
+						}
+						tp_inst.hour_slider.slider("option", "value", h);
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / hourGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
+				$tp.find(".ui_tpicker_minute table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * minuteGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.minute_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / minuteGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showSecond && o.secondGrid > 0) {
+				$tp.find(".ui_tpicker_second table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * secondGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.second_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / secondGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				$tp.find(".ui_tpicker_millisec table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * millisecGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.millisec_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / millisecGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+			if ($buttonPanel.length) { $buttonPanel.before($tp); }
+			else { $dp.append($tp); }
+
+			this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
+
+			if (this.inst !== null) {
+				var timeDefined = this.timeDefined;
+				this._onTimeChange();
+				this.timeDefined = timeDefined;
+			}
+
+			//Emulate datepicker onSelect behavior. Call on slidestop.
+			var onSelectDelegate = function() {
+				tp_inst._onSelectHandler();
+			};
+			this.hour_slider.bind('slidestop',onSelectDelegate);
+			this.minute_slider.bind('slidestop',onSelectDelegate);
+			this.second_slider.bind('slidestop',onSelectDelegate);
+			this.millisec_slider.bind('slidestop',onSelectDelegate);
+
+			// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+			if (this._defaults.addSliderAccess){
+				var sliderAccessArgs = this._defaults.sliderAccessArgs;
+				setTimeout(function(){ // fix for inline mode
+					if($tp.find('.ui-slider-access').length === 0){
+						$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+						// fix any grids since sliders are shorter
+						var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+						if(sliderAccessWidth){
+							$tp.find('table:visible').each(function(){
+								var $g = $(this),
+									oldWidth = $g.outerWidth(),
+									oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
+									newWidth = oldWidth - sliderAccessWidth,
+									newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
+
+								$g.css({ width: newWidth, marginLeft: newMarginLeft });
+							});
+						}
+					}
+				},0);
+			}
+			// end slideAccess integration
+
+		}
+	},
+
+	//########################################################################
+	// This function tries to limit the ability to go outside the
+	// min/max date range
+	//########################################################################
+	_limitMinMaxDateTime: function(dp_inst, adjustSliders){
+		var o = this._defaults,
+			dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+		if(!this._defaults.showTimepicker) { return; } // No time so nothing to check here
+
+		if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
+			var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+				minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){
+				this.hourMinOriginal = o.hourMin;
+				this.minuteMinOriginal = o.minuteMin;
+				this.secondMinOriginal = o.secondMin;
+				this.millisecMinOriginal = o.millisecMin;
+			}
+
+			if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+				this._defaults.hourMin = minDateTime.getHours();
+				if (this.hour <= this._defaults.hourMin) {
+					this.hour = this._defaults.hourMin;
+					this._defaults.minuteMin = minDateTime.getMinutes();
+					if (this.minute <= this._defaults.minuteMin) {
+						this.minute = this._defaults.minuteMin;
+						this._defaults.secondMin = minDateTime.getSeconds();
+					} else if (this.second <= this._defaults.secondMin){
+						this.second = this._defaults.secondMin;
+						this._defaults.millisecMin = minDateTime.getMilliseconds();
+					} else {
+						if(this.millisec < this._defaults.millisecMin) {
+							this.millisec = this._defaults.millisecMin;
+                        }
+						this._defaults.millisecMin = this.millisecMinOriginal;
+					}
+				} else {
+					this._defaults.minuteMin = this.minuteMinOriginal;
+					this._defaults.secondMin = this.secondMinOriginal;
+					this._defaults.millisecMin = this.millisecMinOriginal;
+				}
+			}else{
+				this._defaults.hourMin = this.hourMinOriginal;
+				this._defaults.minuteMin = this.minuteMinOriginal;
+				this._defaults.secondMin = this.secondMinOriginal;
+				this._defaults.millisecMin = this.millisecMinOriginal;
+			}
+		}
+
+		if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
+			var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+				maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
+				this.hourMaxOriginal = o.hourMax;
+				this.minuteMaxOriginal = o.minuteMax;
+				this.secondMaxOriginal = o.secondMax;
+				this.millisecMaxOriginal = o.millisecMax;
+			}
+
+			if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
+				this._defaults.hourMax = maxDateTime.getHours();
+				if (this.hour >= this._defaults.hourMax) {
+					this.hour = this._defaults.hourMax;
+					this._defaults.minuteMax = maxDateTime.getMinutes();
+					if (this.minute >= this._defaults.minuteMax) {
+						this.minute = this._defaults.minuteMax;
+						this._defaults.secondMax = maxDateTime.getSeconds();
+					} else if (this.second >= this._defaults.secondMax) {
+						this.second = this._defaults.secondMax;
+						this._defaults.millisecMax = maxDateTime.getMilliseconds();
+					} else {
+						if(this.millisec > this._defaults.millisecMax) { this.millisec = this._defaults.millisecMax; }
+						this._defaults.millisecMax = this.millisecMaxOriginal;
+					}
+				} else {
+					this._defaults.minuteMax = this.minuteMaxOriginal;
+					this._defaults.secondMax = this.secondMaxOriginal;
+					this._defaults.millisecMax = this.millisecMaxOriginal;
+				}
+			}else{
+				this._defaults.hourMax = this.hourMaxOriginal;
+				this._defaults.minuteMax = this.minuteMaxOriginal;
+				this._defaults.secondMax = this.secondMaxOriginal;
+				this._defaults.millisecMax = this.millisecMaxOriginal;
+			}
+		}
+
+		if(adjustSliders !== undefined && adjustSliders === true){
+			var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
+                minMax  = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
+                secMax  = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
+				millisecMax  = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
+
+			if(this.hour_slider) {
+				this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
+            }
+			if(this.minute_slider) {
+				this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
+            }
+			if(this.second_slider){
+				this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
+            }
+			if(this.millisec_slider) {
+				this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec);
+            }
+		}
+
+	},
+
+
+	//########################################################################
+	// when a slider moves, set the internal time...
+	// on time change is also called when the time is updated in the text field
+	//########################################################################
+	_onTimeChange: function() {
+		var hour   = (this.hour_slider) ? this.hour_slider.slider('value') : false,
+			minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
+			second = (this.second_slider) ? this.second_slider.slider('value') : false,
+			millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
+			timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+			o = this._defaults;
+
+		if (typeof(hour) == 'object') { hour = false; }
+		if (typeof(minute) == 'object') { minute = false; }
+		if (typeof(second) == 'object') { second = false; }
+		if (typeof(millisec) == 'object') { millisec = false; }
+		if (typeof(timezone) == 'object') { timezone = false; }
+
+		if (hour !== false) { hour = parseInt(hour,10); }
+		if (minute !== false) { minute = parseInt(minute,10); }
+		if (second !== false) { second = parseInt(second,10); }
+		if (millisec !== false) { millisec = parseInt(millisec,10); }
+
+		var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+		// If the update was done in the input field, the input field should not be updated.
+		// If the update was done using the sliders, update the input field.
+		var hasChanged = (hour != this.hour || minute != this.minute ||
+				second != this.second || millisec != this.millisec ||
+				(this.ampm.length > 0 &&
+				    (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
+				timezone != this.timezone);
+
+		if (hasChanged) {
+
+			if (hour !== false) { this.hour = hour; }
+			if (minute !== false) { this.minute = minute; }
+			if (second !== false) { this.second = second; }
+			if (millisec !== false) { this.millisec = millisec; }
+			if (timezone !== false) { this.timezone = timezone; }
+
+			if (!this.inst) { this.inst = $.datepicker._getInst(this.$input[0]); }
+
+			this._limitMinMaxDateTime(this.inst, true);
+		}
+		if (o.ampm) { this.ampm = ampm; }
+
+		//this._formatTime();
+		this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
+		if (this.$timeObj) { this.$timeObj.text(this.formattedTime + o.timeSuffix); }
+		this.timeDefined = true;
+		if (hasChanged) { this._updateDateTime(); }
+	},
+
+	//########################################################################
+	// call custom onSelect.
+	// bind to sliders slidestop, and grid click.
+	//########################################################################
+	_onSelectHandler: function() {
+		var onSelect = this._defaults.onSelect;
+		var inputEl = this.$input ? this.$input[0] : null;
+		if (onSelect && inputEl) {
+			onSelect.apply(inputEl, [this.formattedDateTime, this]);
+		}
+	},
+
+	//########################################################################
+	// left for any backwards compatibility
+	//########################################################################
+	_formatTime: function(time, format) {
+		time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone };
+		var tmptime = (format || this._defaults.timeFormat).toString();
+
+		tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
+
+		if (arguments.length) { return tmptime; }
+		else { this.formattedTime = tmptime; }
+	},
+
+	//########################################################################
+	// update our input with the new date time..
+	//########################################################################
+	_updateDateTime: function(dp_inst) {
+		dp_inst = this.inst || dp_inst;
+		var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+			dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+			formatCfg = $.datepicker._getFormatConfig(dp_inst),
+			timeAvailable = dt !== null && this.timeDefined;
+		this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+		var formattedDateTime = this.formattedDate;
+		// remove following lines to force every changes in date picker to change the input value
+		// Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
+		// If the user manually empty the value in the input field, the date picker will never change selected value.
+		//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+		//	return;
+        //}
+
+		if (this._defaults.timeOnly === true) {
+			formattedDateTime = this.formattedTime;
+		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+			formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+		}
+
+		this.formattedDateTime = formattedDateTime;
+
+		if(!this._defaults.showTimepicker) {
+			this.$input.val(this.formattedDate);
+		} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+			this.$altInput.val(this.formattedTime);
+			this.$input.val(this.formattedDate);
+		} else if(this.$altInput) {
+			this.$altInput.val(formattedDateTime);
+			this.$input.val(formattedDateTime);
+		} else {
+			this.$input.val(formattedDateTime);
+		}
+
+		this.$input.trigger("change");
+	}
+
+});
+
+$.fn.extend({
+	//########################################################################
+	// shorthand just to use timepicker..
+	//########################################################################
+	timepicker: function(o) {
+		o = o || {};
+		var tmp_args = arguments;
+
+		if (typeof o == 'object') { tmp_args[0] = $.extend(o, { timeOnly: true }); }
+
+		return $(this).each(function() {
+			$.fn.datetimepicker.apply($(this), tmp_args);
+		});
+	},
+
+	//########################################################################
+	// extend timepicker to datepicker
+	//########################################################################
+	datetimepicker: function(o) {
+		o = o || {};
+		var tmp_args = arguments;
+
+		if (typeof(o) == 'string'){
+			if(o == 'getDate') {
+				return $.fn.datepicker.apply($(this[0]), tmp_args);
+            }
+			else {
+				return this.each(function() {
+					var $t = $(this);
+					$t.datepicker.apply($t, tmp_args);
+				});
+            }
+		}
+		else {
+			return this.each(function() {
+				var $t = $(this);
+				$t.datepicker($.timepicker._newInst($t, o)._defaults);
+			});
+        }
+	}
+});
+
+$.datepicker.parseDateTime = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+	var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+	if (parseRes.timeObj)
+	{
+		var t = parseRes.timeObj;
+		parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+	}
+
+	return parseRes.date;
+};
+
+$.datepicker.parseTime = function(timeFormat, timeString, options) {
+	
+	//########################################################################
+	// pattern for standard and localized AM/PM markers
+	//########################################################################
+	var getPatternAmpm = function(amNames, pmNames) {
+		var markers = [];
+		if (amNames) {
+			$.merge(markers, amNames);
+        }
+		if (pmNames) {
+			$.merge(markers, pmNames);
+        }
+		markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&'); });
+		return '(' + markers.join('|') + ')?';
+	};
+   
+	//########################################################################
+	// figure out position of time elements.. cause js cant do named captures
+	//########################################################################
+	var getFormatPositions = function( timeFormat ) {
+		var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
+			orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 };
+
+		if (finds) {
+			for (var i = 0; i < finds.length; i++) {
+				if (orders[finds[i].toString().charAt(0)] == -1) {
+					orders[finds[i].toString().charAt(0)] = i + 1;
+                }
+            }
+        }
+		return orders;
+	};
+    
+	var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {});
+    
+	var regstr = '^' + timeFormat.toString()
+			.replace(/h{1,2}/ig, '(\\d?\\d)')
+			.replace(/m{1,2}/ig, '(\\d?\\d)')
+			.replace(/s{1,2}/ig, '(\\d?\\d)')
+			.replace(/l{1}/ig, '(\\d?\\d?\\d)')
+			.replace(/t{1,2}/ig, getPatternAmpm(o.amNames, o.pmNames))
+			.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
+			.replace(/\s/g, '\\s?') + o.timeSuffix + '$',
+		order = getFormatPositions(timeFormat),
+		ampm = '',
+		treg;
+
+	treg = timeString.match(new RegExp(regstr, 'i'));
+
+	var resTime = {hour: 0, minute: 0, second: 0, millisec: 0};
+    
+	if (treg) {
+		if (order.t !== -1) {
+			if (treg[order.t] === undefined || treg[order.t].length === 0) {
+				ampm = '';
+				resTime.ampm = '';
+			} else {
+				ampm = $.inArray(treg[order.t], o.amNames) !== -1 ? 'AM' : 'PM';
+				resTime.ampm = o[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+			}
+		}
+
+		if (order.h !== -1) {
+			if (ampm == 'AM' && treg[order.h] == '12') {
+				resTime.hour = 0; // 12am = 0 hour
+			} else {
+                if (ampm == 'PM' && treg[order.h] != '12') {
+                    resTime.hour = parseInt(treg[order.h],10) + 12; // 12pm = 12 hour, any other pm = hour + 12
+                }
+                else { resTime.hour = Number(treg[order.h]); }
+            }
+		}
+
+		if (order.m !== -1) { resTime.minute = Number(treg[order.m]); }
+		if (order.s !== -1) { resTime.second = Number(treg[order.s]); }
+		if (order.l !== -1) { resTime.millisec = Number(treg[order.l]); }
+		if (order.z !== -1 && treg[order.z] !== undefined) {
+			var tz = treg[order.z].toUpperCase();
+			switch (tz.length) {
+				case 1:	// Z
+					tz = o.timezoneIso8601 ? 'Z' : '+0000';
+					break;
+				case 5:	// +hhmm
+					if (o.timezoneIso8601) {
+						tz = tz.substring(1) == '0000' ?
+							'Z' :
+							tz.substring(0, 3) + ':' + tz.substring(3);
+                    }
+					break;
+				case 6:	// +hh:mm
+					if (!o.timezoneIso8601) {
+						tz = tz == 'Z' || tz.substring(1) == '00:00' ?
+							'+0000' :
+							tz.replace(/:/, '');
+					} else {
+                        if (tz.substring(1) == '00:00') {
+                            tz = 'Z';
+                        }
+                    }
+					break;
+			}
+			resTime.timezone = tz;
+		}
+
+
+		return resTime;
+	}
+
+	return false;
+};
+
+//########################################################################
+// format the time all pretty...
+// format = string format of the time
+// time = a {}, not a Date() for timezones
+// options = essentially the regional[].. amNames, pmNames, ampm
+//########################################################################
+$.datepicker.formatTime = function(format, time, options) {
+	options = options || {};
+	options = $.extend($.timepicker._defaults, options);
+	time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
+
+	var tmptime = format;
+	var ampmName = options.amNames[0];
+
+	var hour = parseInt(time.hour, 10);
+	if (options.ampm) {
+		if (hour > 11){
+			ampmName = options.pmNames[0];
+			if(hour > 12) {
+				hour = hour % 12;
+            }
+		}
+		if (hour === 0) {
+			hour = 12;
+        }
+	}
+	tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) {
+		switch (match.toLowerCase()) {
+			case 'hh': return ('0' + hour).slice(-2);
+			case 'h':  return hour;
+			case 'mm': return ('0' + time.minute).slice(-2);
+			case 'm':  return time.minute;
+			case 'ss': return ('0' + time.second).slice(-2);
+			case 's':  return time.second;
+			case 'l':  return ('00' + time.millisec).slice(-3);
+			case 'z':  return time.timezone;
+			case 't': case 'tt':
+				if (options.ampm) {
+					if (match.length == 1) {
+						ampmName = ampmName.charAt(0);
+                    }
+					return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
+				}
+				return '';
+		}
+	});
+
+	tmptime = $.trim(tmptime);
+	return tmptime;
+};
+
+//########################################################################
+// the bad hack :/ override datepicker so it doesnt close on select
+// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+//########################################################################
+$.datepicker._base_selectDate = $.datepicker._selectDate;
+$.datepicker._selectDate = function (id, dateStr) {
+	var inst = this._getInst($(id)[0]),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		tp_inst._limitMinMaxDateTime(inst, true);
+		inst.inline = inst.stay_open = true;
+		//This way the onSelect handler called from calendarpicker get the full dateTime
+		this._base_selectDate(id, dateStr);
+		inst.inline = inst.stay_open = false;
+		this._notifyChange(inst);
+		this._updateDatepicker(inst);
+	}
+	else { this._base_selectDate(id, dateStr); }
+};
+
+//#############################################################################################
+// second bad hack :/ override datepicker so it triggers an event when changing the input field
+// and does not redraw the datepicker on every selectDate event
+//#############################################################################################
+$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+$.datepicker._updateDatepicker = function(inst) {
+
+	// don't popup the datepicker if there is another instance already opened
+	var input = inst.input[0];
+	if($.datepicker._curInst &&
+	   $.datepicker._curInst != inst &&
+	   $.datepicker._datepickerShowing &&
+	   $.datepicker._lastInput != input) {
+		return;
+	}
+
+	if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+		this._base_updateDatepicker(inst);
+
+		// Reload the time control when changing something in the input text field.
+		var tp_inst = this._get(inst, 'timepicker');
+		if(tp_inst) {
+			tp_inst._addTimePicker(inst);
+
+			if (tp_inst._defaults.useLocalTimezone) { //checks daylight saving with the new date.
+				var date = new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay, 12);
+				selectLocalTimeZone(tp_inst, date);
+				tp_inst._onTimeChange();
+			}
+		}
+	}
+};
+
+//#######################################################################################
+// third bad hack :/ override datepicker so it allows spaces and colon in the input field
+//#######################################################################################
+$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+$.datepicker._doKeyPress = function(event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if ($.datepicker._get(inst, 'constrainInput')) {
+			var ampm = tp_inst._defaults.ampm,
+				dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+				datetimeChars = tp_inst._defaults.timeFormat.toString()
+								.replace(/[hms]/g, '')
+								.replace(/TT/g, ampm ? 'APM' : '')
+								.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+								.replace(/tT/g, ampm ? 'AaPpMm' : '')
+								.replace(/T/g, ampm ? 'AP' : '')
+								.replace(/tt/g, ampm ? 'apm' : '')
+								.replace(/t/g, ampm ? 'ap' : '') +
+								" " +
+								tp_inst._defaults.separator +
+								tp_inst._defaults.timeSuffix +
+								(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
+								(tp_inst._defaults.amNames.join('')) +
+								(tp_inst._defaults.pmNames.join('')) +
+								dateChars,
+				chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+			return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+		}
+	}
+
+	return $.datepicker._base_doKeyPress(event);
+};
+
+//#######################################################################################
+// Override key up event to sync manual input changes.
+//#######################################################################################
+$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+$.datepicker._doKeyUp = function (event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+			try {
+				$.datepicker._updateDatepicker(inst);
+			}
+			catch (err) {
+				$.datepicker.log(err);
+			}
+		}
+	}
+
+	return $.datepicker._base_doKeyUp(event);
+};
+
+//#######################################################################################
+// override "Today" button to also grab the time.
+//#######################################################################################
+$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+$.datepicker._gotoToday = function(id) {
+	var inst = this._getInst($(id)[0]),
+		$dp = inst.dpDiv;
+	this._base_gotoToday(id);
+	var tp_inst = this._get(inst, 'timepicker');
+	selectLocalTimeZone(tp_inst);
+	var now = new Date();
+	this._setTime(inst, now);
+	$( '.ui-datepicker-today', $dp).click();
+};
+
+//#######################################################################################
+// Disable & enable the Time in the datetimepicker
+//#######################################################################################
+$.datepicker._disableTimepickerDatepicker = function(target) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = false;
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+$.datepicker._enableTimepickerDatepicker = function(target) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = true;
+		tp_inst._addTimePicker(inst); // Could be disabled on page load
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create our own set time function
+//#######################################################################################
+$.datepicker._setTime = function(inst, date) {
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var defaults = tp_inst._defaults,
+			// calling _setTime with no date sets time to defaults
+			hour = date ? date.getHours() : defaults.hour,
+			minute = date ? date.getMinutes() : defaults.minute,
+			second = date ? date.getSeconds() : defaults.second,
+			millisec = date ? date.getMilliseconds() : defaults.millisec;
+		//check if within min/max times..
+		// correct check if within min/max times. 	
+		// Rewritten by Scott A. Woodward
+		var hourEq = hour === defaults.hourMin,
+			minuteEq = minute === defaults.minuteMin,
+			secondEq = second === defaults.secondMin;
+		var reset = false;
+		if(hour < defaults.hourMin || hour > defaults.hourMax)  
+			reset = true;
+		else if( (minute < defaults.minuteMin || minute > defaults.minuteMax) && hourEq)
+			reset = true;
+		else if( (second < defaults.secondMin || second > defaults.secondMax ) && hourEq && minuteEq)
+			reset = true;
+		else if( (millisec < defaults.millisecMin || millisec > defaults.millisecMax) && hourEq && minuteEq && secondEq)
+			reset = true;
+		if(reset) {
+			hour = defaults.hourMin;
+			minute = defaults.minuteMin;
+			second = defaults.secondMin;
+			millisec = defaults.millisecMin;
+		}
+		tp_inst.hour = hour;
+		tp_inst.minute = minute;
+		tp_inst.second = second;
+		tp_inst.millisec = millisec;
+		if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
+		if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
+		if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
+		if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
+
+		tp_inst._onTimeChange();
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create new public method to set only time, callable as $().datepicker('setTime', date)
+//#######################################################################################
+$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+    
+	if (tp_inst) {
+		this._setDateFromField(inst);
+		var tp_date;
+		if (date) {
+			if (typeof date == "string") {
+				tp_inst._parseTime(date, withDate);
+				tp_date = new Date();
+				tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+			}
+			else { tp_date = new Date(date.getTime()); }
+			if (tp_date.toString() == 'Invalid Date') { tp_date = undefined; }
+			this._setTime(inst, tp_date);
+		}
+	}
+
+};
+
+//#######################################################################################
+// override setDate() to allow setting time too within Date object
+//#######################################################################################
+$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+$.datepicker._setDateDatepicker = function(target, date) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+	var tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+
+	this._updateDatepicker(inst);
+	this._base_setDateDatepicker.apply(this, arguments);
+	this._setTimeDatepicker(target, tp_date, true);
+};
+
+//#######################################################################################
+// override getDate() to allow getting time too within Date object
+//#######################################################################################
+$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+$.datepicker._getDateDatepicker = function(target, noDefault) {
+	var inst = this._getInst(target);
+    if (!inst) { return; }
+    
+    var tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		this._setDateFromField(inst, noDefault);
+		var date = this._getDate(inst);
+		if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) { date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec); }
+		return date;
+	}
+	return this._base_getDateDatepicker(target, noDefault);
+};
+
+//#######################################################################################
+// override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+// An option in datapicker to ignore extra format characters would be nicer.
+//#######################################################################################
+$.datepicker._base_parseDate = $.datepicker.parseDate;
+$.datepicker.parseDate = function(format, value, settings) {
+    var splitRes = splitDateTime(format, value, settings);
+	return $.datepicker._base_parseDate(format, splitRes[0], settings);
+};
+
+//#######################################################################################
+// override formatDate to set date with time to the input
+//#######################################################################################
+$.datepicker._base_formatDate = $.datepicker._formatDate;
+$.datepicker._formatDate = function(inst, day, month, year){
+	var tp_inst = this._get(inst, 'timepicker');
+	if(tp_inst) {
+		tp_inst._updateDateTime(inst);
+		return tp_inst.$input.val();
+	}
+	return this._base_formatDate(inst);
+};
+
+//#######################################################################################
+// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+//#######################################################################################
+$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+$.datepicker._optionDatepicker = function(target, name, value) {
+	var inst = this._getInst(target);
+    if (!inst) { return null; }
+    
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var min = null, max = null, onselect = null;
+		if (typeof name == 'string') { // if min/max was set with the string
+			if (name === 'minDate' || name === 'minDateTime' ) {
+				min = value;
+            }
+			else {
+                if (name === 'maxDate' || name === 'maxDateTime') {
+                    max = value;
+                }
+                else {
+                    if (name === 'onSelect') {
+                        onselect = value;
+                    }
+                }
+            }
+		} else {
+            if (typeof name == 'object') { //if min/max was set with the JSON
+                if (name.minDate) {
+                    min = name.minDate;
+                } else {
+                    if (name.minDateTime) {
+                        min = name.minDateTime;
+                    } else {
+                        if (name.maxDate) {
+                            max = name.maxDate;
+                        } else {
+                            if (name.maxDateTime) {
+                                max = name.maxDateTime;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+		if(min) { //if min was set
+			if (min === 0) {
+				min = new Date();
+            } else {
+				min = new Date(min);
+            }
+
+			tp_inst._defaults.minDate = min;
+			tp_inst._defaults.minDateTime = min;
+		} else if (max) { //if max was set
+			if(max===0) {
+				max=new Date();
+            } else {
+				max= new Date(max);
+            }
+			tp_inst._defaults.maxDate = max;
+			tp_inst._defaults.maxDateTime = max;
+		} else if (onselect) {
+			tp_inst._defaults.onSelect = onselect;
+        }
+	}
+	if (value === undefined) {
+		return this._base_optionDatepicker(target, name);
+    }
+	return this._base_optionDatepicker(target, name, value);
+};
+
+//#######################################################################################
+// jQuery extend now ignores nulls!
+//#######################################################################################
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] === null || props[name] === undefined) {
+			target[name] = props[name];
+        }
+    }
+	return target;
+}
+
+//#######################################################################################
+// Splits datetime string into date ans time substrings.
+// Throws exception when date can't be parsed
+// If only date is present, time substring eill be '' 
+//#######################################################################################
+var splitDateTime = function(dateFormat, dateTimeString, dateSettings)
+{
+	try {
+		var date = $.datepicker._base_parseDate(dateFormat, dateTimeString, dateSettings);
+	} catch (err) {
+		if (err.indexOf(":") >= 0) {
+			// Hack!  The error message ends with a colon, a space, and
+			// the "extra" characters.  We rely on that instead of
+			// attempting to perfectly reproduce the parsing algorithm.
+            var dateStringLength = dateTimeString.length-(err.length-err.indexOf(':')-2);
+            var timeString = dateTimeString.substring(dateStringLength);
+
+            return [dateTimeString.substring(0, dateStringLength), dateTimeString.substring(dateStringLength)];
+            
+		} else {
+			throw err;
+		}
+	}
+	return [dateTimeString, ''];
+};
+
+//#######################################################################################
+// Internal function to parse datetime interval
+// Returns: {date: Date, timeObj: Object}, where
+//   date - parsed date without time (type Date)
+//   timeObj = {hour: , minute: , second: , millisec: } - parsed time. Optional
+//#######################################################################################
+var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings)
+{
+    var date;
+    var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings);
+	date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
+    if (splitRes[1] !== '')
+    {
+        var timeString = splitRes[1];
+        var separator = timeSettings && timeSettings.separator ? timeSettings.separator : $.timepicker._defaults.separator;            
+        if ( timeString.indexOf(separator) !== 0) {
+            throw 'Missing time separator';
+        }
+        timeString = timeString.substring(separator.length);
+        var parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
+        if (parsedTime === null) {
+            throw 'Wrong time format';
+        }
+        return {date: date, timeObj: parsedTime};
+    } else {
+        return {date: date};
+    }
+};
+
+//#######################################################################################
+// Internal function to set timezone_select to the local timezone
+//#######################################################################################
+var selectLocalTimeZone = function(tp_inst, date)
+{
+	if (tp_inst && tp_inst.timezone_select) {
+		tp_inst._defaults.useLocalTimezone = true;
+		var now = typeof date !== 'undefined' ? date : new Date();
+		var tzoffset = timeZoneString(now);
+		if (tp_inst._defaults.timezoneIso8601) {
+			tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+        }
+		tp_inst.timezone_select.val(tzoffset);
+	}
+};
+
+// Input: Date Object
+// Output: String with timezone offset, e.g. '+0100'
+var timeZoneString = function(date)
+{
+	var off = date.getTimezoneOffset() * -10100 / 60;
+	var timezone = (off >= 0 ? '+' : '-') + Math.abs(off).toString().substr(1);
+	return timezone;
+};
+
+$.timepicker = new Timepicker(); // singleton instance
+$.timepicker.version = "1.0.1";
+
+})(jQuery);
@@ -4340,6 +4340,14 @@ h1#agenda-title {
   margin: 5px 0;
   padding: 5px;
 }
+
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
 /* Categories block stuff */
  
 .categories-block ul {
@@ -14,7 +14,7 @@ class TaskTest &lt; ActiveSupport::TestCase
       t.requestor = 1
     end
     assert_nothing_raised do
-      t.requestor = Person.new
+      t.requestor = Profile.new
     end
   end
...	...	@@ -265,9 +265,9 @@ module ApplicationHelper
265	265
266	266	VIEW_EXTENSIONS = %w[.rhtml .html.erb]
267	267
268		- def partial_for_class_in_view_path(klass, view_path)
	268	+ def partial_for_class_in_view_path(klass, view_path, suffix = nil)
269	269	return nil if klass.nil?
270		- name = klass.name.underscore
	270	+ name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
271	271
272	272	search_name = String.new(name)
273	273	if search_name.include?("/")
...	...	@@ -285,28 +285,17 @@ module ApplicationHelper
285	285	partial_for_class_in_view_path(klass.superclass, view_path)
286	286	end
287	287
288		- def partial_for_class(klass)
	288	+ def partial_for_class(klass, suffix=nil)
289	289	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
290	290	name = klass.name.underscore
291	291	@controller.view_paths.each do \|view_path\|
292		- partial = partial_for_class_in_view_path(klass, view_path)
	292	+ partial = partial_for_class_in_view_path(klass, view_path, suffix)
293	293	return partial if partial
294	294	end
295	295
296	296	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
297	297	end
298	298
299		- def partial_for_task_class(klass, action)
300		- raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
301		-
302		- name = "#{klass.name.underscore}_#{action.to_s}"
303		- VIEW_EXTENSIONS.each do \|ext\|
304		- return name if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], '_'+name+ext))
305		- end
306		-
307		- partial_for_task_class(klass.superclass, action)
308		- end
309		-
310	299	def view_for_profile_actions(klass)
311	300	raise ArgumentError, 'No profile actions view for this class.' if klass.nil?
312	301
...	...
...	...	@@ -123,6 +123,119 @@ module FormsHelper
123	123	options_for_select.join("\n")
124	124	end
125	125
	126	+ def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
	127	+ datepicker_options[:disabled] \|\|= false
	128	+ datepicker_options[:alt_field] \|\|= ''
	129	+ datepicker_options[:alt_format] \|\|= ''
	130	+ datepicker_options[:append_text] \|\|= ''
	131	+ datepicker_options[:auto_size] \|\|= false
	132	+ datepicker_options[:button_image] \|\|= ''
	133	+ datepicker_options[:button_image_only] \|\|= false
	134	+ datepicker_options[:button_text] \|\|= '...'
	135	+ datepicker_options[:calculate_week] \|\|= 'jQuery.datepicker.iso8601Week'
	136	+ datepicker_options[:change_month] \|\|= false
	137	+ datepicker_options[:change_year] \|\|= false
	138	+ datepicker_options[:close_text] \|\|= _('Done')
	139	+ datepicker_options[:constrain_input] \|\|= true
	140	+ datepicker_options[:current_text] \|\|= _('Today')
	141	+ datepicker_options[:date_format] \|\|= 'mm/dd/yy'
	142	+ datepicker_options[:day_names] \|\|= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
	143	+ datepicker_options[:day_names_min] \|\|= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
	144	+ datepicker_options[:day_names_short] \|\|= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
	145	+ datepicker_options[:default_date] \|\|= nil
	146	+ datepicker_options[:duration] \|\|= 'normal'
	147	+ datepicker_options[:first_day] \|\|= 0
	148	+ datepicker_options[:goto_current] \|\|= false
	149	+ datepicker_options[:hide_if_no_prev_next] \|\|= false
	150	+ datepicker_options[:is_rtl] \|\|= false
	151	+ datepicker_options[:max_date] \|\|= nil
	152	+ datepicker_options[:min_date] \|\|= nil
	153	+ datepicker_options[:month_names] \|\|= [_('January'), _('February'), _('March'), _('April'), _('May'), _('June'), _('July'), _('August'), _('September'), _('October'), _('November'), _('December')]
	154	+ datepicker_options[:month_names_short] \|\|= [_('Jan'), _('Feb'), _('Mar'), _('Apr'), _('May'), _('Jun'), _('Jul'), _('Aug'), _('Sep'), _('Oct'), _('Nov'), _('Dec')]
	155	+ datepicker_options[:navigation_as_date_format] \|\|= false
	156	+ datepicker_options[:next_text] \|\|= _('Next')
	157	+ datepicker_options[:number_of_months] \|\|= 1
	158	+ datepicker_options[:prev_text] \|\|= _('Prev')
	159	+ datepicker_options[:select_other_months] \|\|= false
	160	+ datepicker_options[:short_year_cutoff] \|\|= '+10'
	161	+ datepicker_options[:show_button_panel] \|\|= false
	162	+ datepicker_options[:show_current_at_pos] \|\|= 0
	163	+ datepicker_options[:show_month_after_year] \|\|= false
	164	+ datepicker_options[:show_on] \|\|= 'focus'
	165	+ datepicker_options[:show_options] \|\|= {}
	166	+ datepicker_options[:show_other_months] \|\|= false
	167	+ datepicker_options[:show_week] \|\|= false
	168	+ datepicker_options[:step_months] \|\|= 1
	169	+ datepicker_options[:week_header] \|\|= _('Wk')
	170	+ datepicker_options[:year_range] \|\|= 'c-10:c+10'
	171	+ datepicker_options[:year_suffix] \|\|= ''
	172	+
	173	+ element_id = html_options[:id] \|\| 'datepicker-date'
	174	+ value = value.strftime(format) if value.present?
	175	+ method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
	176	+ result = text_field_tag(name, value, html_options)
	177	+ result +=
	178	+ "
	179	+ <script type='text/javascript'>
	180	+ jQuery('##{element_id}').#{method}({
	181	+ disabled: #{datepicker_options[:disabled].to_json},
	182	+ altField: #{datepicker_options[:alt_field].to_json},
	183	+ altFormat: #{datepicker_options[:alt_format].to_json},
	184	+ appendText: #{datepicker_options[:append_text].to_json},
	185	+ autoSize: #{datepicker_options[:auto_size].to_json},
	186	+ buttonImage: #{datepicker_options[:button_image].to_json},
	187	+ buttonImageOnly: #{datepicker_options[:button_image_only].to_json},
	188	+ buttonText: #{datepicker_options[:button_text].to_json},
	189	+ calculateWeek: #{datepicker_options[:calculate_week].to_json},
	190	+ changeMonth: #{datepicker_options[:change_month].to_json},
	191	+ changeYear: #{datepicker_options[:change_year].to_json},
	192	+ closeText: #{datepicker_options[:close_text].to_json},
	193	+ constrainInput: #{datepicker_options[:constrain_input].to_json},
	194	+ currentText: #{datepicker_options[:current_text].to_json},
	195	+ dateFormat: #{datepicker_options[:date_format].to_json},
	196	+ dayNames: #{datepicker_options[:day_names].to_json},
	197	+ dayNamesMin: #{datepicker_options[:day_names_min].to_json},
	198	+ dayNamesShort: #{datepicker_options[:day_names_short].to_json},
	199	+ defaultDate: #{datepicker_options[:default_date].to_json},
	200	+ duration: #{datepicker_options[:duration].to_json},
	201	+ firstDay: #{datepicker_options[:first_day].to_json},
	202	+ gotoCurrent: #{datepicker_options[:goto_current].to_json},
	203	+ hideIfNoPrevNext: #{datepicker_options[:hide_if_no_prev_next].to_json},
	204	+ isRTL: #{datepicker_options[:is_rtl].to_json},
	205	+ maxDate: #{datepicker_options[:max_date].to_json},
	206	+ minDate: #{datepicker_options[:min_date].to_json},
	207	+ monthNames: #{datepicker_options[:month_names].to_json},
	208	+ monthNamesShort: #{datepicker_options[:month_names_short].to_json},
	209	+ navigationAsDateFormat: #{datepicker_options[:navigation_as_date_format].to_json},
	210	+ nextText: #{datepicker_options[:next_text].to_json},
	211	+ numberOfMonths: #{datepicker_options[:number_of_months].to_json},
	212	+ prevText: #{datepicker_options[:prev_text].to_json},
	213	+ selectOtherMonths: #{datepicker_options[:select_other_months].to_json},
	214	+ shortYearCutoff: #{datepicker_options[:short_year_cutoff].to_json},
	215	+ showButtonPanel: #{datepicker_options[:show_button_panel].to_json},
	216	+ showCurrentAtPos: #{datepicker_options[:show_current_at_pos].to_json},
	217	+ showMonthAfterYear: #{datepicker_options[:show_month_after_year].to_json},
	218	+ showOn: #{datepicker_options[:show_on].to_json},
	219	+ showOptions: #{datepicker_options[:show_options].to_json},
	220	+ showOtherMonths: #{datepicker_options[:show_other_months].to_json},
	221	+ showWeek: #{datepicker_options[:show_week].to_json},
	222	+ stepMonths: #{datepicker_options[:step_months].to_json},
	223	+ weekHeader: #{datepicker_options[:week_header].to_json},
	224	+ yearRange: #{datepicker_options[:year_range].to_json},
	225	+ yearSuffix: #{datepicker_options[:year_suffix].to_json}
	226	+ })
	227	+ </script>
	228	+ "
	229	+ result
	230	+ end
	231	+
	232	+ def date_range_field(from_name, to_name, from_value, to_value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
	233	+ from_id = html_options[:from_id] \|\| 'datepicker-from-date'
	234	+ to_id = html_options[:to_id] \|\| 'datepicker-to-date'
	235	+ return _('From') +' '+ date_field(from_name, from_value, format, datepicker_options, html_options.merge({:id => from_id})) +
	236	+ ' ' + _('until') +' '+ date_field(to_name, to_value, format, datepicker_options, html_options.merge({:id => to_id}))
	237	+ end
	238	+
126	239	protected
127	240	def self.next_id_number
128	241	if defined? @@id_num
...	...
...	...	@@ -31,7 +31,7 @@ class Task < ActiveRecord::Base
31	31	end
32	32	end
33	33
34		- belongs_to :requestor, :class_name => 'Person', :foreign_key => :requestor_id
	34	+ belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
35	35	belongs_to :target, :foreign_key => :target_id, :polymorphic => true
36	36
37	37	validates_uniqueness_of :code, :on => :create
...	...
...	...	@@ -2,7 +2,8 @@
2	2	'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
3	3	'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
4	4	'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
5		-'add-and-join', 'report-abuse', 'catalog', 'manage-products', :cache => 'cache-general' %>
	5	+'add-and-join', 'report-abuse', 'catalog', 'manage-products',
	6	+'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
6	7
7	8	<% language = FastGettext.locale %>
8	9	<% %w{messages methods}.each do \|type\| %>
...	...
...	...	@@ -50,13 +50,13 @@
50	50	<% fields_for "tasks[#{task.id}][task]", task do \|f\| %>
51	51	<% if task.accept_details %>
52	52	<div id="on-accept-information-<%=task.id%>" style="display: none">
53		- <%= render :partial => partial_for_task_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
	53	+ <%= render :partial => partial_for_class(task.class, :accept_details), :locals => {:task => task, :f => f} %>
54	54	</div>
55	55	<% end %>
56	56
57	57	<% if task.reject_details %>
58	58	<div id="on-reject-information-<%=task.id%>" style="display: none">
59		- <%= render :partial => partial_for_task_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
	59	+ <%= render :partial => partial_for_class(task.class, :reject_details), :locals => {:task => task, :f => f} %>
60	60	</div>
61	61	<% end %>
62	62	<% end %>
...	...
...	...	@@ -0,0 +1,145 @@
	1	+class CustomFormsPluginMyprofileController < MyProfileController
	2	+ def index
	3	+ @forms = CustomFormsPlugin::Form.from(profile)
	4	+ end
	5	+
	6	+ def create
	7	+ @form = CustomFormsPlugin::Form.new(:profile => profile)
	8	+ @fields = []
	9	+ @empty_field = CustomFormsPlugin::Field.new
	10	+ if request.post?
	11	+ begin
	12	+ @form.update_attributes!(params[:form])
	13	+ params[:fields] = format_kind(params[:fields])
	14	+ params[:fields] = format_choices(params[:fields])
	15	+ params[:fields] = set_form_id(params[:fields], @form.id)
	16	+ create_fields(new_fields(params))
	17	+ session['notice'] = _('Form created')
	18	+ redirect_to :action => 'index'
	19	+ rescue Exception => exception
	20	+ logger.error(exception.to_s)
	21	+ session['notice'] = _('Form could not be created')
	22	+ end
	23	+ end
	24	+ end
	25	+
	26	+ def edit
	27	+ @form = CustomFormsPlugin::Form.find(params[:id])
	28	+ @fields = @form.fields
	29	+ @empty_field = CustomFormsPlugin::TextField.new
	30	+ if request.post?
	31	+ begin
	32	+ @form.update_attributes!(params[:form])
	33	+ params[:fields] = format_kind(params[:fields])
	34	+ params[:fields] = format_choices(params[:fields])
	35	+ remove_fields(params, @form)
	36	+ create_fields(new_fields(params))
	37	+ update_fields(edited_fields(params))
	38	+ session['notice'] = _('Form updated')
	39	+ redirect_to :action => 'index'
	40	+ rescue Exception => exception
	41	+ logger.error(exception.to_s)
	42	+ session['notice'] = _('Form could not be updated')
	43	+ end
	44	+ end
	45	+ end
	46	+
	47	+ def remove
	48	+ @form = CustomFormsPlugin::Form.find(params[:id])
	49	+ begin
	50	+ @form.destroy
	51	+ session[:notice] = _('Form removed')
	52	+ rescue
	53	+ session[:notice] = _('Form could not be removed')
	54	+ end
	55	+ redirect_to :action => 'index'
	56	+ end
	57	+
	58	+ def submissions
	59	+ @form = CustomFormsPlugin::Form.find(params[:id])
	60	+ @submissions = @form.submissions
	61	+ end
	62	+
	63	+ def show_submission
	64	+ @submission = CustomFormsPlugin::Submission.find(params[:id])
	65	+ @form = @submission.form
	66	+ end
	67	+
	68	+ private
	69	+
	70	+ def new_fields(params)
	71	+ result = params[:fields].map {\|id, hash\| hash.has_key?(:real_id) ? nil : hash}.compact
	72	+ result.delete_if {\|field\| field[:name].blank?}
	73	+ result
	74	+ end
	75	+
	76	+ def edited_fields(params)
	77	+ params[:fields].map {\|id, hash\| hash.has_key?(:real_id) ? hash : nil}.compact
	78	+ end
	79	+
	80	+ def create_fields(fields)
	81	+ fields.each do \|field\|
	82	+ case field[:type]
	83	+ when 'text_field'
	84	+ CustomFormsPlugin::TextField.create!(field)
	85	+ when 'select_field'
	86	+ CustomFormsPlugin::SelectField.create!(field)
	87	+ else
	88	+ CustomFormsPlugin::Field.create!(field)
	89	+ end
	90	+ end
	91	+ end
	92	+
	93	+ def update_fields(fields)
	94	+ fields.each do \|field_attrs\|
	95	+ field = CustomFormsPlugin::Field.find(field_attrs.delete(:real_id))
	96	+ field.attributes = field_attrs
	97	+ field.save! if field.changed?
	98	+ end
	99	+ end
	100	+
	101	+ def format_kind(fields)
	102	+ fields.each do \|id, field\|
	103	+ next if field[:kind].blank?
	104	+ kind = field.delete(:kind)
	105	+ case kind
	106	+ when 'radio'
	107	+ field[:list] = false
	108	+ field[:multiple] = false
	109	+ when 'check_box'
	110	+ field[:list] = false
	111	+ field[:multiple] = true
	112	+ when 'select'
	113	+ field[:list] = true
	114	+ field[:multiple] = false
	115	+ when 'multiple_select'
	116	+ field[:list] = true
	117	+ field[:multiple] = true
	118	+ end
	119	+ end
	120	+ fields
	121	+ end
	122	+
	123	+ def format_choices(fields)
	124	+ fields.each do \|id, field\|
	125	+ next if !field.has_key?(:choices)
	126	+ field[:choices] = field[:choices].map {\|key, value\| value}.inject({}) do \|result, choice\|
	127	+ hash = (choice[:name].blank? \|\| choice[:value].blank?) ? {} : {choice[:name] => choice[:value]}
	128	+ result.merge!(hash)
	129	+ end
	130	+ end
	131	+ fields
	132	+ end
	133	+
	134	+ def remove_fields(params, form)
	135	+ present_fields = params[:fields].map{\|id, value\| value}.collect {\|field\| field[:real_id]}.compact
	136	+ form.fields.each {\|field\| field.destroy if !present_fields.include?(field.id.to_s) }
	137	+ end
	138	+
	139	+ def set_form_id(fields, form_id)
	140	+ fields.each do \|id, field\|
	141	+ field[:form_id] = form_id
	142	+ end
	143	+ fields
	144	+ end
	145	+end
...	...
...	...	@@ -0,0 +1,45 @@
	1	+class CustomFormsPluginProfileController < ProfileController
	2	+
	3	+ before_filter :has_access, :show
	4	+
	5	+ def show
	6	+ @form = CustomFormsPlugin::Form.find(params[:id])
	7	+ if user
	8	+ @submission \|\|= CustomFormsPlugin::Submission.find_by_form_id_and_profile_id(@form.id,user.id)
	9	+ @submission \|\|= CustomFormsPlugin::Submission.new(:form_id => @form.id, :profile_id => user.id)
	10	+ else
	11	+ @submission \|\|= CustomFormsPlugin::Submission.new(:form_id => @form.id)
	12	+ end
	13	+ if request.post?
	14	+ begin
	15	+ extend(CustomFormsPlugin::Helper)
	16	+ answers = build_answers(params[:submission], @form)
	17	+ failed_answers = answers.select {\|answer\| !answer.valid? }
	18	+ if failed_answers.empty?
	19	+ if !user
	20	+ @submission.author_name = params[:author_name]
	21	+ @submission.author_email = params[:author_email]
	22	+ end
	23	+ @submission.save!
	24	+ answers.map {\|answer\| answer.submission = @submission; answer.save!}
	25	+ else
	26	+ @submission.valid?
	27	+ failed_answers.each do \|answer\|
	28	+ @submission.errors.add(answer.field.name.to_sym, answer.errors[answer.field.slug.to_sym])
	29	+ end
	30	+ end
	31	+ session[:notice] = _('Submission saved')
	32	+ redirect_to :action => 'show'
	33	+ rescue
	34	+ session[:notice] = _('Submission could not be saved')
	35	+ end
	36	+ end
	37	+ end
	38	+
	39	+ private
	40	+
	41	+ def has_access
	42	+ form = CustomFormsPlugin::Form.find(params[:id])
	43	+ render_access_denied if !form.accessible_to(user)
	44	+ end
	45	+end
...	...
...	...	@@ -0,0 +1,20 @@
	1	+class CreateCustomFormsPluginForms < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :custom_forms_plugin_forms do \|t\|
	4	+ t.string :name
	5	+ t.string :slug
	6	+ t.text :description
	7	+ t.references :profile
	8	+ t.datetime :begining
	9	+ t.datetime :ending
	10	+ t.boolean :report_submissions, :default => false
	11	+ t.boolean :on_membership, :default => false
	12	+ t.string :access
	13	+ t.timestamps
	14	+ end
	15	+ end
	16	+
	17	+ def self.down
	18	+ drop_table :custom_forms_plugin_forms
	19	+ end
	20	+end
...	...
...	...	@@ -0,0 +1,21 @@
	1	+class CreateCustomFormsPluginFields < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :custom_forms_plugin_fields do \|t\|
	4	+ t.string :name
	5	+ t.string :slug
	6	+ t.string :type
	7	+ t.string :default_value
	8	+ t.string :choices
	9	+ t.float :minimum
	10	+ t.float :maximum
	11	+ t.references :form
	12	+ t.boolean :mandatory, :default => false
	13	+ t.boolean :multiple
	14	+ t.boolean :list
	15	+ end
	16	+ end
	17	+
	18	+ def self.down
	19	+ drop_table :custom_forms_plugin_fields
	20	+ end
	21	+end
...	...
...	...	@@ -0,0 +1,13 @@
	1	+class CreateCustomFormsPluginAnswers < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :custom_forms_plugin_answers do \|t\|
	4	+ t.text :value
	5	+ t.references :field
	6	+ t.references :submission
	7	+ end
	8	+ end
	9	+
	10	+ def self.down
	11	+ drop_table :custom_forms_plugin_answers
	12	+ end
	13	+end
...	...