inline_forms 0.8.5 → 0.8.6

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/app/controllers/inline_forms_controller.rb

@@ -100,8 +100,10 @@ class InlineFormsController < ApplicationController
     @form_element = params[:form_element]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
+    logger.info @form_element.to_s
     send("#{@form_element.to_s}_update", @object, @attribute)
     @object.save
+    logger.info "after"
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
       format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element.to_s}_show", @object, @attribute) %>' }
@@ -118,6 +120,7 @@ class InlineFormsController < ApplicationController
     @object = @Klass.find(params[:id])
     @attribute = params[:attribute]
     @form_element = params[:form_element]
+    close = params[:close] || false
     if @form_element == "associated"
       @sub_id = params[:sub_id]
       if @sub_id.to_i > 0
@@ -130,8 +133,11 @@ class InlineFormsController < ApplicationController
       respond_to do |format|
         @attributes = @object.inline_forms_attribute_list
         # found this here: http://www.ruby-forum.com/topic/211467
-        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object) %>' }
-        }
+        if close
+          format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true %>' } }
+        else
+          format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object) %>' } }
+        end
       end
     else
       respond_to do |format|

data/app/helpers/form_elements/associated.rb

@@ -3,89 +3,92 @@ InlineForms::SPECIAL_COLUMN_TYPES[:associated]=:no_migration
 # associated
 def associated_show(object, attribute)
   #show a list of records
-  out = String.new
-  if @sub_id && @sub_id.to_i > 0
-    # if it's not a new record (sub_id > 0) then just update the list-element
-    out << '<li>'
-    out << link_to( @associated_record._presentation,
-      send('edit_' + @Klass.to_s.underscore + '_path', object,
-        :attribute => attribute,
-        :sub_id => @sub_id,
-        :form_element => this_method.reverse.sub(/.*_/,'').reverse,
-        :update => "attribute_#{attribute.to_s.singularize}_#{@sub_id.to_s}" ),
-      :method => :get,
-      :remote => true )
-    out << '</li>'
-  else
-    # if it's a new record (sub_id == 0) then update the whole <ul> and redraw all list-elements
-    out << "<ul class='associated #{attribute}' id='list_#{attribute}_#{object.id.to_s}'>" if @sub_id.nil?
-    out << '<li class="associated_new">'
-    out << link_to( 'new', send('edit_' + @Klass.to_s.underscore + '_path',
-        object,
-        :attribute => attribute,
-        :sub_id => 0,
-        :form_element => this_method.sub(/_[a-z]+$/,''),
-        :update => "list_#{attribute}_#{object.id.to_s}" ),
-      :method => :get,
-      :remote => true )
-    out << '</li>'
-    if not object.send(attribute.to_s.pluralize).empty?
-      # if there are things to show, show them
-      object.send(attribute.to_s.pluralize).each do |m|
-        out << "<span id='attribute_#{attribute.to_s.singularize}_#{m.id.to_s}'>"
-        out << '<li>'
-        out << link_to( m._presentation, send('edit_' + @Klass.to_s.underscore + '_path',
-            object,
-            :attribute => attribute,
-            :sub_id => m.id,
-            :form_element => this_method.sub(/_[a-z]+$/,''),
-            :update => "attribute_#{attribute.to_s.singularize}_#{m.id.to_s}" ),
-          :method => :get,
-          :remote => true )
-        out << '</li>'
-        out << '</span>'
-      end
-    end
-    # add a 'new' link for creating a new record
-    out << '</ul>' if @sub_id.nil?
-  end
-  raw(out)
+  inline_forms_list(object.send(attribute.to_s.pluralize))
 end
-
-def associated_edit(object, attribute)
-  # @sub_id is the id of the associated record
-  if @sub_id.to_i > 0
-    # only if @sub_id > 0, means we have a associated record
-    @associated_record_id = object.send(attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
-    @associated_record = object.send(attribute)[@associated_record_id]
-    @update_span = "attribute_#{attribute.to_s.singularize}_#{@sub_id.to_s}"
-  else
-    # but if @sub_id = 0, then we are dealing with a new associated record
-    # in that case, we .new a record, and the update_span is the whole <ul>
-    @associated_record = attribute.to_s.singularize.capitalize.constantize.new
-    @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
-  end
-  render :partial => "inline_forms/subform"
-end
-
-def associated_update(object, attribute)
-  return if object.id.nil?
-  if @sub_id.to_i > 0
-    # get the existing associated record
-    @associated_record_id = object.send(attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
-    @associated_record = object.send(attribute)[@associated_record_id]
-    @update_span = "attribute_" + attribute.to_s.singularize + '_' + @sub_id.to_s
-  else
-    # create a new associated record
-    @associated_record = object.send(attribute.to_sym).new
-    @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
-  end
-  # process the sub_form attributes (attributes). These are declared in the model!
-  @associated_record.inline_forms_attribute_list.each do | @subform_description, @subform_attribute, @subform_element |
-    # have no fear
-    send("#{@subform_element}_update", @associated_record, @subform_attribute)
-  end
-  @associated_record.save
-end
-
-
+#
+#  out = String.new
+#  if @sub_id && @sub_id.to_i > 0
+#    # if it's not a new record (sub_id > 0) then just update the list-element
+#    out << '<li>'
+#    out << link_to( @associated_record._presentation,
+#      send('edit_' + @Klass.to_s.underscore + '_path', object,
+#        :attribute => attribute,
+#        :sub_id => @sub_id,
+#        :form_element => this_method.reverse.sub(/.*_/,'').reverse,
+#        :update => "attribute_#{attribute.to_s.singularize}_#{@sub_id.to_s}" ),
+#      :method => :get,
+#      :remote => true )
+#    out << '</li>'
+#  else
+#    # if it's a new record (sub_id == 0) then update the whole <ul> and redraw all list-elements
+#    out << "<ul class='associated #{attribute}' id='list_#{attribute}_#{object.id.to_s}'>" if @sub_id.nil?
+#    out << '<li class="associated_new">'
+#    out << link_to( 'new', send('edit_' + @Klass.to_s.underscore + '_path',
+#        object,
+#        :attribute => attribute,
+#        :sub_id => 0,
+#        :form_element => this_method.sub(/_[a-z]+$/,''),
+#        :update => "list_#{attribute}_#{object.id.to_s}" ),
+#      :method => :get,
+#      :remote => true )
+#    out << '</li>'
+#    if not object.send(attribute.to_s.pluralize).empty?
+#      # if there are things to show, show them
+#      object.send(attribute.to_s.pluralize).each do |m|
+#        out << "<span id='attribute_#{attribute.to_s.singularize}_#{m.id.to_s}'>"
+#        out << '<li>'
+#        out << link_to( m._presentation, send('edit_' + @Klass.to_s.underscore + '_path',
+#            object,
+#            :attribute => attribute,
+#            :sub_id => m.id,
+#            :form_element => this_method.sub(/_[a-z]+$/,''),
+#            :update => "attribute_#{attribute.to_s.singularize}_#{m.id.to_s}" ),
+#          :method => :get,
+#          :remote => true )
+#        out << '</li>'
+#        out << '</span>'
+#      end
+#    end
+#    # add a 'new' link for creating a new record
+#    out << '</ul>' if @sub_id.nil?
+#  end
+#  raw(out)
+# end
+#
+#def associated_edit(object, attribute)
+#  # @sub_id is the id of the associated record
+#  if @sub_id.to_i > 0
+#    # only if @sub_id > 0, means we have a associated record
+#    @associated_record_id = object.send(attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
+#    @associated_record = object.send(attribute)[@associated_record_id]
+#    @update_span = "attribute_#{attribute.to_s.singularize}_#{@sub_id.to_s}"
+#  else
+#    # but if @sub_id = 0, then we are dealing with a new associated record
+#    # in that case, we .new a record, and the update_span is the whole <ul>
+#    @associated_record = attribute.to_s.singularize.capitalize.constantize.new
+#    @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
+#  end
+#  render :partial => "inline_forms/subform"
+#end
+#
+#def associated_update(object, attribute)
+#  return if object.id.nil?
+#  if @sub_id.to_i > 0
+#    # get the existing associated record
+#    @associated_record_id = object.send(attribute.to_s.singularize + "_ids").index(@sub_id.to_i)
+#    @associated_record = object.send(attribute)[@associated_record_id]
+#    @update_span = "attribute_" + attribute.to_s.singularize + '_' + @sub_id.to_s
+#  else
+#    # create a new associated record
+#    @associated_record = object.send(attribute.to_sym).new
+#    @update_span = 'list_' + attribute.to_s + '_' + object.id.to_s
+#  end
+#  # process the sub_form attributes (attributes). These are declared in the model!
+#  @associated_record.inline_forms_attribute_list.each do | @subform_description, @subform_attribute, @subform_element |
+#    # have no fear
+#    send("#{@subform_element}_update", @associated_record, @subform_attribute) unless @subform_element == :associated
+#  end
+#  @associated_record.save
+#end
+#
+#

data/app/helpers/form_elements/question_list.rb

@@ -0,0 +1,43 @@
+#InlineForms::SPECIAL_COLUMN_TYPES[:question_list]=:no_migration
+
+# checklist
+def question_list_show(object, attribute)
+  out = '<ul class="question_list">'
+  out << link_to_inline_edit(object, attribute) if object.send(attribute).empty?
+  object.send(attribute).sort.each do | item |
+    out << '<li>'
+    out << link_to_inline_edit(object, attribute, item._presentation )
+    out << '</li>'
+  end
+  out <<  '</ul>'
+  out.html_safe
+end
+
+def question_list_edit(object, attribute)
+  object.send(attribute).build  if object.send(attribute).empty?
+  values = object.send(attribute).first.class.name.constantize.find(:all) # TODO bring order
+  out = '<div class="edit_form_checklist">'
+  out << '<ul>'
+  Question.all.each do | question |
+    out << '<li>'
+    out << h(question._presentation)
+    unless question.subquestions.empty?
+      out << '<ul>'
+      question.subquestions.each do | subquestion |
+        out << '<li>'
+        out << h(subquestion._presentation)
+        out << '</li>'
+      end
+      out << '</ul>'
+    end
+    out << '</li>'
+  end
+  out << '</ul>'
+  out << '</div>'
+  out.html_safe
+end
+
+def question_list_update(object, attribute)
+  params[attribute] ||= {}
+  object.send(attribute.singularize + '_ids=', params[attribute].keys)
+end

data/app/helpers/inline_forms_helper.rb

@@ -15,8 +15,13 @@ module InlineFormsHelper
   def inline_forms_show_record(object, attributes=nil)
     attributes ||= object.inline_forms_attribute_list
     out = String.new
+    css_class_id = object.class.to_s.underscore + '_' + object.id.to_s
+    close_link = link_to h(object._presentation + " - CLOSE "),
+                    send( object.class.to_s.underscore + '_path', object, :update => css_class_id, :close => true ),
+                    :remote => true
+    out << close_link
     attributes.each do | attribute, name, form_element |
-      css_class_id = "attribute_#{attribute}_#{object.id}"
+      css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
       name_cell = content_tag :td, :valign=>'top' do
         content_tag :div, :class=> "attribute_name attribute_#{attribute} form_element_#{form_element}" do
           h(name)
@@ -44,7 +49,7 @@ module InlineFormsHelper
     attributes ||= object.inline_forms_attribute_list
     out = String.new
     attributes.each do | attribute, name, form_element |
-      unless form_element.to_sym == :associated #|| form_element.to_sym == :check_list
+      unless form_element.to_sym == :associated 
         css_class_id = "attribute_#{attribute}_#{object.id}"
         name_cell = content_tag :td, :valign=>'top' do
           content_tag :div, :class=> "attribute_name attribute_#{attribute} form_element_#{form_element}" do
@@ -64,14 +69,28 @@ module InlineFormsHelper
     return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
   end
 
-  # display a list of objects
+#  # display a list of objects
+#  def inline_forms_list(objects, tag=:li)
+#    t = String.new
+#    objects.each do |object|
+#      css_class_id = @Klass.to_s.underscore + '_' + object.id.to_s
+#      t += content_tag tag, :id => css_class_id do
+#        link_to h(object._presentation),
+#          send( @Klass.to_s.underscore + '_path', object, :update => css_class_id),
+#          :remote => true
+#      end
+#    end
+#    return raw(t)
+#  end
+
+  # display a list of objects without links
   def inline_forms_list(objects, tag=:li)
     t = String.new
     objects.each do |object|
-      css_class_id = @Klass.to_s.underscore + '_' + object.id.to_s
+      css_class_id = object.class.to_s.underscore + '_' + object.id.to_s
       t += content_tag tag, :id => css_class_id do
-        link_to h(object._presentation), 
-          send( @Klass.to_s.underscore + '_path', object, :update => css_class_id),
+        link_to h(object._presentation),
+          send( object.class.to_s.underscore + '_path', object, :update => css_class_id),
           :remote => true
       end
     end
@@ -92,12 +111,13 @@ module InlineFormsHelper
     attribute_value = h(attribute_value)
     spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
     attribute_value << "&nbsp;".html_safe * spaces
+    css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
     link_to attribute_value,
-      send( 'edit_' + @Klass.to_s.underscore + '_path',
+      send( 'edit_' + object.class.to_s.underscore + '_path',
       object,
       :attribute => attribute.to_s,
       :form_element => calling_method.sub(/_[a-z]+$/,''),
-      :update => "attribute_#{attribute}_#{object.id}" ),
+      :update => css_class_id ),
       :remote => true
   end
 

data/app/views/inline_forms/_edit.html.erb

@@ -1,4 +1,4 @@
-<% form_tag send(@Klass.to_s.underscore + '_path', :update => @update_span ,
+<% form_tag send(@object.class.to_s.underscore + '_path', :update => @update_span ,
   :attribute => @attribute,
   :form_element => @form_element,
   :sub_id => @sub_id ),
@@ -7,9 +7,9 @@
   :class  => "edit_form",
   :remote => true do -%>
   <div class="edit_form_field">
-    <%= send("#{@form_element.to_s}_edit", @object, @attribute) %>
+    <%= send("#{@form_element}_edit", @object, @attribute) %>
   </div>
-  <%= link_to( send( @Klass.to_s.underscore + '_path', :update => @update_span || "field_#{@attribute}_#{@object.id.to_s}",
+  <%= link_to( send( @object.class.to_s.underscore + '_path', :update => @update_span || "field_#{@attribute}_#{@object.id.to_s}",
       :attribute => @attribute,
       :form_element => @form_element,
       :sub_id => @sub_id ),

data/app/views/inline_forms/_subform.html.erb

@@ -8,7 +8,11 @@
       </td>
       <td valign="top">
         <div class="subform_field-value">
-          <%= send("#{@subform_element}_edit", @associated_record, @subform_field.to_s) %>
+          <% if @subform_element == :associated -%>
+            <%= inline_forms_list @associated_record.send(@subform_field) %>
+          <% else %>
+            <%= send("#{@subform_element}_edit", @associated_record, @subform_field.to_s) %>
+          <% end %>
         </div>
       </td>
     </tr>

data/inline_forms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "app/helpers/form_elements/dropdown_with_values.rb",
     "app/helpers/form_elements/geo_code_curacao.rb",
     "app/helpers/form_elements/image.rb",
+    "app/helpers/form_elements/question_list.rb",
     "app/helpers/form_elements/scale_with_integers.rb",
     "app/helpers/form_elements/scale_with_values.rb",
     "app/helpers/form_elements/text_area.rb",

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -55,8 +55,7 @@ module InlineForms
               name == "_presentation"       ||
               name == "_order"              ||
               name == "_enabled"            ||
-              name == "_id"                 ||
-              relation? )
+              name == "_id" )
       end
 
       def attribute?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Ace Suares
@@ -105,6 +105,7 @@ files:
 - app/helpers/form_elements/dropdown_with_values.rb
 - app/helpers/form_elements/geo_code_curacao.rb
 - app/helpers/form_elements/image.rb
+- app/helpers/form_elements/question_list.rb
 - app/helpers/form_elements/scale_with_integers.rb
 - app/helpers/form_elements/scale_with_values.rb
 - app/helpers/form_elements/text_area.rb