activeadmin-selleo-cms 0.0.45 → 0.0.46

data/app/assets/javascripts/activeadmin-selleo-cms/forms.storage.js

@@ -1,26 +1,56 @@
+function generateUUID(){
+    var d = new Date().getTime();
+    var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        var r = (d + Math.random()*16)%16 | 0;
+        d = Math.floor(d/16);
+        return (c=='x' ? r : (r&0x7|0x8)).toString(16);
+    });
+    return uuid;
+};
+
+function submitAnswer(form_id, input, value){
+    $.post('/form_answers', {
+        form_answer: {
+            form_uuid: localStorage[form_id],
+            dom_id: $(input).attr('id'),
+            form_id: $(input).closest('form').data('form-id'),
+            form_question_id: $(input).data('form-question-id'),
+            value: value
+        }
+    })
+}
+
 function setupCmsForm(form_id) {
     $('#'+form_id+' .required fieldset [type="radio"]:first,[type="checkbox"]:first').attr('required','true');
     $('#'+form_id).validate();
 
-    $.each($('#' + form_id + ' input, textarea'), function(){
-        if ( localStorage[$(this).attr('id')] != undefined ) {
-            if ( ($(this).attr('type') == 'checkbox') || ($(this).attr('type') == 'radio') ) {
-                $(this).attr('checked', (localStorage[$(this).attr('id')] == "true"));
-            } else if ($(this).attr('type') == 'file') {
-//            ??
-            } else {
-                $(this).val(localStorage[$(this).attr('id')]);
+    if (localStorage[form_id] == undefined) {
+        localStorage[form_id] = generateUUID();
+    }
+
+    $.get('/form_answers.json', {
+       form_uuid: localStorage[form_id]
+    }).success(function(resp){
+        $.each(resp, function(){
+            if (this["value"] != null) {
+                var form_elem = $('#'+this["dom_id"]);
+                if ( ($(form_elem).attr('type') == 'checkbox') || ($(form_elem).attr('type') == 'radio') ) {
+                    $(form_elem).attr('checked', true);
+                } else if ($(form_elem).attr('type') == 'file') {
+//                 ??
+                } else {
+                    $(form_elem).val(this["value"]);
+                }
             }
-        }
+        })
     });
 
     $('#' + form_id + ' input, textarea').change(function(){
-        if ( ($(this).attr('type') == 'checkbox') || ($(this).attr('type') == 'radio') ) {
-            localStorage[$(this).attr('id')] = $(this).is(':checked');
-        } else if ($(this).attr('type') == 'file') {
+      if ($(this).attr('type') == 'file') {
 //            ??
-        } else {
-            localStorage[$(this).attr('id')] = $(this).val();
-        }
-    });
+      } else if ( ($(this).attr('type') == 'checkbox') || ($(this).attr('type') == 'radio') ) {
+          submitAnswer(form_id, this, $(this).is(':checked'))
+      } else {
+          submitAnswer(form_id, this, $(this).val())
+    }});
 }

data/app/controllers/form_answers_controller.rb

@@ -0,0 +1,19 @@
+class FormAnswersController < ApplicationController
+
+  respond_to :html, :json
+
+  def create
+    params[:form_answer] ||= {}
+    if answer = ActiveadminSelleoCms::FormAnswer.where(form_uuid: params[:form_answer][:form_uuid], dom_id: params[:form_answer][:dom_id]).first
+      answer.update_attribute(:value, params[:form_answer][:value])
+    else
+      ActiveadminSelleoCms::FormAnswer.create(params[:form_answer])
+    end
+    render nothing: true
+  end
+
+  def index
+    respond_with ActiveadminSelleoCms::FormAnswer.where(form_uuid: params[:form_uuid])
+  end
+
+end

data/app/controllers/forms_controller.rb

@@ -29,4 +29,8 @@ class FormsController < ApplicationController
     end
   end
 
+  def answer
+
+  end
+
 end

data/app/models/activeadmin_selleo_cms/form_answer.rb

@@ -0,0 +1,16 @@
+module ActiveadminSelleoCms
+  class FormAnswer < ActiveRecord::Base
+    attr_accessible :form_uuid, :dom_id, :form_id, :form_question_id, :value
+    validates_presence_of :form_uuid, :dom_id
+
+    belongs_to :form
+    belongs_to :form_question
+
+    after_save do
+      if form_question.input_type == :radio_button_tag and !dom_id.match(/_other/)
+        FormAnswer.where(form_uuid: form_uuid, form_question_id: form_question_id).where("id <> ? AND dom_id NOT LIKE '%_other%'", id).destroy_all
+      end
+    end
+
+  end
+end

data/app/models/activeadmin_selleo_cms/form_question.rb

@@ -13,7 +13,7 @@ module ActiveadminSelleoCms
     acts_as_list :scope => :form_id
 
     attr_accessor :order
-    attr_accessible :title, :question_type, :position, :is_required, :is_multi, :has_other_option, :options_attributes, :order
+    attr_accessible :title, :question_type, :position, :is_required, :is_multi, :has_other_option, :options_attributes, :order, :hint
     accepts_nested_attributes_for :options, allow_destroy: true
 
     validates :title, presence: true, uniqueness: {scope: :form_id}

data/app/models/activeadmin_selleo_cms/section.rb

@@ -63,8 +63,10 @@ module ActiveadminSelleoCms
           end
         end
 
-        doc.css('form[data-form-id]').each do |form|
-          form.replace av.render(:file => File.join(ActiveadminSelleoCms::Engine.root, 'app/views/forms/_form'), :layout => nil, :locals => { :form => Form.find(form.attributes["data-form-id"].to_s) })
+        doc.css('form[data-form-id]').each do |form_tag|
+          if form = Form.find_by_id(form_tag.attributes["data-form-id"].to_s)
+            form_tag.replace av.render(:file => File.join(ActiveadminSelleoCms::Engine.root, 'app/views/forms/_form'), :layout => nil, :locals => { :form => form })
+          end
         end
       end
 

data/app/views/admin/form_questions/_form.html.haml

@@ -1,6 +1,7 @@
 = semantic_nested_form_for [:admin, @form, @form_question], url: (@form_question.new_record? ? admin_form_form_questions_path(@form.id) : admin_form_form_question_path(@form.id, @form_question.id)), remote: true, html: {id: "form_question_form"} do |form|
   = form.inputs "Options" do
     = form.input :title
+    = form.input :hint
     = form.input :is_required
     - unless @form_question.is_type?('file')
       = form.input :is_multi

data/app/views/forms/_form.html.erb

@@ -1,21 +1,30 @@
-<%= form_tag '/forms', multipart: true, id: dom_id(form) do %>
+<%= form_tag '/forms', multipart: true, id: dom_id(form), data: {form_id: form.id} do %>
+  <ol class="questions">
     <% form.questions.each do |question| %>
+      <li class="question <%= question.input_type %>">
         <%= label_tag dom_id(question), question.title %>
+        <% if question.hint.present? %>
+            <p class="hint"><%=  question.hint  %></p>
+        <% end %>
         <% if [:check_box_tag].include? question.input_type %>
             <% question.options.each do |option| %>
-                <%= send(question.input_type, "#{dom_id(question)}[]", option.id, false, required: question.is_required, id: dom_id(option)) %>
+                <%= send(question.input_type, "#{dom_id(question)}[]", option.id, false, required: question.is_required, id: dom_id(option), data: {form_question_id: question.id} ) %>
                 <%= label_tag dom_id(option), option.title %>
             <% end %>
         <% elsif [:radio_button_tag].include? question.input_type %>
             <% question.options.each do |option| %>
-                <%= send(question.input_type, dom_id(question), option.id, false, required: question.is_required, id: dom_id(option)) %>
+                <%= send(question.input_type, dom_id(question), option.id, false, required: question.is_required, id: dom_id(option), data: {form_question_id: question.id}) %>
                 <%= label_tag dom_id(option), option.title %>
             <% end %>
+        <% elsif [:file_field_tag].include? question.input_type %>
+            <%= send(question.input_type, dom_id(question), required: question.is_required, data: {form_question_id: question.id}) %>
         <% else %>
-            <%= send(question.input_type, dom_id(question), "", required: question.is_required) %>
+            <%= send(question.input_type, dom_id(question), "", required: question.is_required, data: {form_question_id: question.id}) %>
         <% end %>
-        <%= text_field_tag "#{dom_id(question)}_other" if question.has_other_option %>
+        <%= text_field_tag "#{dom_id(question)}_other", "", data: {form_question_id: question.id} if question.has_other_option %>
+      </li>
     <% end %>
+  </ol>
 <% end %>
 
 <%= button_to_function "Print", "$('##{dom_id(form)}').printElement({printMode:'popup'});" %>

data/app/views/forms/download.pdf.erb

@@ -6,6 +6,8 @@
                 <%= send(question.input_type, dom_id(question), option.id, Array(params[dom_id(question)]).include?(option.id.to_s)) %>
                 <%= label_tag dom_id(option), option.title %>
             <% end %>
+        <% elsif [:file_field_tag].include? question.input_type %>
+            <%= send(question.input_type, dom_id(question), required: question.is_required) %>
         <% else %>
             <%= send(question.input_type, dom_id(question), params[dom_id(question)]) %>
         <% end %>

data/config/routes.rb

@@ -8,6 +8,8 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :form_answers, :only => [:create, :index]
+
   scope ":locale", :locale => /\w{2}/ do
     scope "search" do
       resources :searches, path: '', only: [:show]

data/db/migrate/20130708195545_create_activeadmin_selleo_cms_form_answers.rb

@@ -0,0 +1,12 @@
+class CreateActiveadminSelleoCmsFormAnswers < ActiveRecord::Migration
+  def change
+    create_table :activeadmin_selleo_cms_form_answers do |t|
+      t.string :form_uuid
+      t.integer :form_id
+      t.integer :form_question_id
+      t.string :dom_id
+      t.string :value
+      t.attachment :data
+    end
+  end
+end

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.45"
+  VERSION = "0.0.46"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.46
   prerelease: 
 platform: ruby
 authors:
@@ -406,6 +406,7 @@ files:
 - app/controllers/forms_controller.rb
 - app/controllers/cms_controller.rb
 - app/controllers/locales_controller.rb
+- app/controllers/form_answers_controller.rb
 - app/controllers/searches_controller.rb
 - app/admin/translation.rb
 - app/admin/active_admin/views_helper.rb
@@ -499,6 +500,7 @@ files:
 - app/models/ckeditor/asset.rb
 - app/models/ckeditor/picture.rb
 - app/models/ckeditor/attachment_file.rb
+- app/models/activeadmin_selleo_cms/form_answer.rb
 - app/models/activeadmin_selleo_cms/section.rb
 - app/models/activeadmin_selleo_cms/attachment.rb
 - app/models/activeadmin_selleo_cms/asset.rb
@@ -529,6 +531,7 @@ files:
 - db/migrate/20121129160200_create_activeadmin_selleo_cms_locales.rb
 - db/migrate/20130109132745_add_fields_to_page.rb
 - db/migrate/20130601141800_add_position_to_related_items.rb
+- db/migrate/20130708195545_create_activeadmin_selleo_cms_form_answers.rb
 - db/migrate/20130531154539_add_position_to_assets.rb
 - db/migrate/20130211151210_create_activeadmin_selleo_cms_related_items.rb
 - db/migrate/20121221164723_create_activeadmin_selleo_cms_searches.rb