activeadmin-selleo-cms 0.0.52 → 0.0.54

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

@@ -50,8 +50,6 @@ function setupCmsForm(form_id) {
                     if (this["value"] == "true") {
                         $(form_elem).attr('checked', true);
                     }
-                } else if ($(form_elem).attr('type') == 'file') {
-                    // do nothing
                 } else {
                     $(form_elem).val(this["value"]);
                 }
@@ -67,4 +65,8 @@ function setupCmsForm(form_id) {
       } else {
           submitAnswer(form_id, this, $(this).val())
     }});
+
+    $.each($('.file_upload'), function(){
+        $(this).find('.files').load('/form_answers/attachments?form_uuid='+localStorage[form_id]+'&form_question_id='+$(this).data('question-id'));
+    });
 }

data/app/controllers/form_answers_controller.rb

@@ -30,4 +30,9 @@ class FormAnswersController < ApplicationController
     render action: :edit
   end
 
+  def attachments
+    @form_answer = ActiveadminSelleoCms::FormAnswer.where(form_uuid: params[:form_uuid], form_question_id: params[:form_question_id]).first
+    render partial: 'attachments'
+  end
+
 end

data/app/mailers/activeadmin_selleo_cms/form_mailer.rb

@@ -3,7 +3,10 @@ module ActiveadminSelleoCms
     def form_submission(form, form_uuid)
       @form = form
       @form_uuid = form_uuid
-      mail(subject: "New form submission")
+      mail(
+          to: @form.delivery_emails(@form_uuid),
+          subject: I18n.t("active_admin.cms.forms.email_subject")
+      )
     end
   end
 end

data/app/models/activeadmin_selleo_cms/form.rb

@@ -3,9 +3,18 @@ module ActiveadminSelleoCms
     PDF_PATH = Rails.root.join('public','system','pdf')
 
     has_many :questions, class_name: "FormQuestion", :order => "position"
+    has_many :answers, through: :questions
 
     validates :title, presence: true
+    validates :email, presence: true
 
     attr_protected :id
+
+    def delivery_emails(form_uuid)
+      [(email || ActionMailer::Base.default[:to])] +
+        answers.joins(:form_question).
+            where(:activeadmin_selleo_cms_form_questions => {:question_type => FormQuestion::TYPE_EMAIL}).
+            where("value IS NOT NULL AND value <> ''").where(:form_uuid => form_uuid).map(&:value)
+    end
   end
 end

data/app/models/activeadmin_selleo_cms/form_answer.rb

@@ -1,14 +1,13 @@
 module ActiveadminSelleoCms
   class FormAnswer < ActiveRecord::Base
-    attr_accessible :form_uuid, :dom_id, :form_id, :form_question_id, :value, :data
+    attr_accessible :form_uuid, :dom_id, :form_id, :form_question_id, :value, :form_answer_attachments_attributes
     validates_presence_of :form_uuid, :dom_id
 
-    has_attached_file :data,
-                      :url  => "/system/cms/form_answers/:id/:style_:basename.:extension",
-                      :path => ":rails_root/public/system/cms/form_answers/:id/:style_:basename.:extension"
-
     belongs_to :form
     belongs_to :form_question
+    has_many :form_answer_attachments
+
+    accepts_nested_attributes_for :form_answer_attachments
 
     after_save do
       if form_question.input_type == :radio_button_tag and !dom_id.match(/_other/)
@@ -24,11 +23,11 @@ module ActiveadminSelleoCms
       end
     end
 
-    def self.file_for(form_uuid, dom_id)
-      if answer = self.where(form_uuid: form_uuid, dom_id: dom_id).first and answer.data.exists?
-        answer
+    def self.files_for(form_uuid, dom_id)
+      if answer = self.where(form_uuid: form_uuid, dom_id: dom_id).first
+        answer.form_answer_attachments
       else
-        nil
+        []
       end
     end
 

data/app/models/activeadmin_selleo_cms/form_answer_attachment.rb

@@ -0,0 +1,11 @@
+module ActiveadminSelleoCms
+  class ActiveadminSelleoCms::FormAnswerAttachment < ActiveRecord::Base
+    attr_accessible :form_answer_id, :data
+
+    has_attached_file :data,
+                      :url  => "/system/cms/form_answer_attachments/:id/:style_:basename.:extension",
+                      :path => ":rails_root/public/system/cms/form_answer_attachments/:id/:style_:basename.:extension"
+
+    belongs_to :form_answer
+  end
+end

data/app/models/activeadmin_selleo_cms/form_question.rb

@@ -5,11 +5,13 @@ module ActiveadminSelleoCms
     TYPE_SELECT = 1
     TYPE_FILE = 2
     TYPE_LABEL = 3
-    TYPES = [TYPE_TEXT, TYPE_SELECT, TYPE_FILE, TYPE_LABEL]
-    TYPE_NAMES = ["text question", "select question", "file upload", "label"]
+    TYPE_EMAIL = 4
+    TYPES = [TYPE_TEXT, TYPE_SELECT, TYPE_FILE, TYPE_LABEL, TYPE_EMAIL]
+    TYPE_NAMES = ["text question", "select question", "file upload", "label", "email"]
 
     belongs_to :form
     has_many :options, class_name: "FormQuestionOption", :order => "position"
+    has_many :answers, class_name: "FormAnswer"
 
     acts_as_list :scope => :form_id
 
@@ -26,7 +28,7 @@ module ActiveadminSelleoCms
       end
 
       def question_type_dictionary(int)
-        ["text question", "select question", "file upload", "label"][int]
+        TYPE_NAMES[int]
       end
 
     end
@@ -60,6 +62,8 @@ module ActiveadminSelleoCms
         :file_field_tag
       elsif question_type == TYPE_LABEL
         :legend
+      elsif question_type == TYPE_EMAIL
+        :email_field_tag
       end
     end
 

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

@@ -5,7 +5,7 @@
     - unless @form_question.is_type?('label')
       = form.input :hint
       = form.input :is_required
-      - unless @form_question.is_type?('file')
+      - unless @form_question.is_type?('file') or @form_question.is_type?('email')
         = form.input :is_multi
       - if @form_question.is_type?('select')
         = form.input :has_other_option

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

@@ -1,6 +1,7 @@
 = semantic_form_for [:admin, @form], url: admin_form_path(@form) do |form|
   = form.inputs "General options" do
     = form.input :title
+    = form.input :email, label: t("active_admin.cms.forms.email")
 
   %ol.draggable_questions_container
     - ActiveadminSelleoCms::FormQuestion::TYPES.each do |qtype|

data/app/views/form_answers/_attachments.html.haml

@@ -0,0 +1,3 @@
+%ol
+  - @form_answer.form_answer_attachments.each do |att|
+    %li= att.data_file_name

data/app/views/form_answers/_form.html.haml

@@ -1,5 +1,7 @@
+%legend= t("active_admin.cms.forms.upload_new_file")
 = semantic_form_for @form_answer, remote: true, html: { multipart: true } do |form|
 
-  = form.inputs id: 'attachment_fields' do
-    = form.input :data, hint: @form_answer.data_file_name
-    = form.actions :submit
+  = form.semantic_fields_for :form_answer_attachments, form.object.form_answer_attachments.build do |attachment_form|
+    = attachment_form.input :data, hint: @form_answer.data_file_name
+
+    = form.action :submit, label: t("active_admin.cms.forms.upload_file"), as: :button

data/app/views/form_answers/update.js.erb

@@ -1,2 +1,2 @@
-$('#popup').effect('highlight');
-$('#popup form').html('<%= j render partial: 'form' %>');
+$('#popup').dialog('close');
+$('[data-question-id="<%= @form_answer.form_question.id %>"] .files').html('<%= j render partial: 'attachments' %>');

data/app/views/forms/_download.erb

@@ -34,10 +34,15 @@
               <%= text_field_tag "#{dom_id(question)}_other", ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], "#{dom_id(question)}_other"), data: {form_question_id: question.id} if question.has_other_option %>
             </div>
         <% elsif [:file_field_tag].include? question.input_type %>
-            <% if file = ActiveadminSelleoCms::FormAnswer.file_for(params[:form_uuid], dom_id(question)) %>
-                <p><%= link_to file.data_file_name, file.data.url %></p>
-            <% end %>
-            <%#= button_to_function "Select file", "fileUpload('#{dom_id(@form)}', '#{dom_id(question)}', #{question.id})", style: "padding: 5px;" %>
+            <div class="file_upload">
+                <ol>
+                  <% ActiveadminSelleoCms::FormAnswer.files_for(params[:form_uuid], dom_id(question)).each do |file| %>
+                      <li><%= file.data_file_name %></li>
+                  <% end %>
+                </ol>
+            </div>
+        <% elsif question.input_type == :legend %>
+            <legend><%= question.label %></legend>
         <% else %>
             <%= send(question.input_type, dom_id(question), ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(question)), required: question.is_required, data: {form_question_id: question.id}) %>
         <% end %>

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

@@ -33,8 +33,8 @@
             </div>
         <% elsif [:file_field_tag].include? question.input_type %>
             <div class="file_upload" data-question-id="<%= question.id %>">
-                <p></p>
-                <%= button_to_function t("active_admin.cms.forms.select_file"), "fileUpload('#{dom_id(form)}', '#{dom_id(question)}', #{question.id})", style: "padding: 5px;" %>
+              <div class="files"></div>
+              <%= button_to_function t("active_admin.cms.forms.upload_new_file"), "fileUpload('#{dom_id(form)}', '#{dom_id(question)}', #{question.id})", style: "padding: 5px;" %>
             </div>
         <% elsif question.input_type == :legend %>
             <legend><%= question.label %></legend>

data/config/locales/cms.en.yml

@@ -39,6 +39,10 @@ en:
         submit: "Submit form"
         print: "Print"
         pdf: "Download PDF"
-        select_file: "Select file"
         other: "Other"
-        required: " (required)"
+        required: " (required)"
+        email: "Delivery email"
+        email_subject: "New form has been submitted"
+        upload: "Upload"
+        upload_new_file: "Upload new file"
+        uploaded_files: "Uploaded files"

data/config/routes.rb

@@ -11,6 +11,7 @@ Rails.application.routes.draw do
   resources :form_answers do
     collection do
       post :find_or_create
+      get :attachments
     end
   end
 

data/db/migrate/20130814151821_add_email_to_forms.rb

@@ -0,0 +1,5 @@
+class AddEmailToForms < ActiveRecord::Migration
+  def change
+    add_column :activeadmin_selleo_cms_forms, :email, :string
+  end
+end

data/db/migrate/20130814184227_create_activeadmin_selleo_cms_form_answer_attachments.rb

@@ -0,0 +1,9 @@
+class CreateActiveadminSelleoCmsFormAnswerAttachments < ActiveRecord::Migration
+  def change
+    create_table :activeadmin_selleo_cms_form_answer_attachments do |t|
+      t.belongs_to :form_answer
+      t.attachment :data
+      t.timestamps
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.52"
+  VERSION = "0.0.54"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.52
+  version: 0.0.54
   prerelease: 
 platform: ruby
 authors:
@@ -447,6 +447,7 @@ files:
 - app/assets/images/admin/remove.png
 - app/assets/images/admin/question_3.png
 - app/assets/images/admin/question_1.png
+- app/assets/images/admin/question_4.png
 - app/assets/images/activeadmin-selleo-cms/Jcrop.gif
 - app/assets/javascripts/active_admin.js
 - app/assets/javascripts/ckeditor/config.js
@@ -525,6 +526,7 @@ files:
 - app/views/form_answers/_form.html.haml
 - app/views/form_answers/update.js.erb
 - app/views/form_answers/edit.html.haml
+- app/views/form_answers/_attachments.html.haml
 - app/views/activeadmin_selleo_cms/form_mailer/form_submission.html.erb
 - app/modules/activeadmin_selleo_cms/content_translation.rb
 - app/models/translation.rb
@@ -543,6 +545,7 @@ files:
 - app/models/activeadmin_selleo_cms/form_question.rb
 - app/models/activeadmin_selleo_cms/form_question_option.rb
 - app/models/activeadmin_selleo_cms/image.rb
+- app/models/activeadmin_selleo_cms/form_answer_attachment.rb
 - app/models/activeadmin_selleo_cms/related_item.rb
 - config/routes.rb
 - config/locales/cms.pl.yml
@@ -558,6 +561,7 @@ files:
 - db/migrate/20130207213528_change_activeadmin_selleo_cms_assets.rb
 - db/migrate/20130625104333_create_activeadmin_selleo_cms_forms.rb
 - db/migrate/20121204112326_create_ckeditor_assets.rb
+- db/migrate/20130814151821_add_email_to_forms.rb
 - db/migrate/20130102113712_create_activeadmin_selleo_cms_assets.rb
 - db/migrate/20130206173233_change_activeadmin_selleo_cms_searches.rb
 - db/migrate/20121129160200_create_activeadmin_selleo_cms_locales.rb
@@ -568,6 +572,7 @@ files:
 - db/migrate/20130211151210_create_activeadmin_selleo_cms_related_items.rb
 - db/migrate/20121221164723_create_activeadmin_selleo_cms_searches.rb
 - db/migrate/20130108153415_add_redirect_to_first_sub_page.rb
+- db/migrate/20130814184227_create_activeadmin_selleo_cms_form_answer_attachments.rb
 - db/migrate/20121206231053_create_activeadmin_selleo_cms_sections.rb
 - db/migrate/20130625104459_create_activeadmin_selleo_cms_form_question_options.rb
 - db/migrate/20121227222912_create_translations.rb