activeadmin-selleo-cms 0.0.46 → 0.0.47

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

@@ -20,6 +20,16 @@ function submitAnswer(form_id, input, value){
     })
 }
 
+function fileUpload(form_id, dom_id, question_id) {
+    $('#popup').html('').load('/form_answers/find_or_create',
+        {
+            form_uuid: localStorage[form_id],
+            dom_id: dom_id,
+            form_question_id: question_id
+        }
+    ).dialog('open');
+}
+
 function setupCmsForm(form_id) {
     $('#'+form_id+' .required fieldset [type="radio"]:first,[type="checkbox"]:first').attr('required','true');
     $('#'+form_id).validate();
@@ -28,6 +38,8 @@ function setupCmsForm(form_id) {
         localStorage[form_id] = generateUUID();
     }
 
+    $('#'+form_id).data('uuid', localStorage[form_id]);
+
     $.get('/form_answers.json', {
        form_uuid: localStorage[form_id]
     }).success(function(resp){
@@ -35,9 +47,11 @@ function setupCmsForm(form_id) {
             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);
+                    if (this["value"] == "true") {
+                        $(form_elem).attr('checked', true);
+                    }
                 } else if ($(form_elem).attr('type') == 'file') {
-//                 ??
+                    // do nothing
                 } else {
                     $(form_elem).val(this["value"]);
                 }
@@ -47,7 +61,7 @@ function setupCmsForm(form_id) {
 
     $('#' + form_id + ' input, textarea').change(function(){
       if ($(this).attr('type') == 'file') {
-//            ??
+        // do nothing
       } else if ( ($(this).attr('type') == 'checkbox') || ($(this).attr('type') == 'radio') ) {
           submitAnswer(form_id, this, $(this).is(':checked'))
       } else {

data/app/assets/javascripts/activeadmin-selleo-cms/jquery.printElement.js

@@ -115,7 +115,7 @@
         });
         $("textarea", $element).each(function () {
             //Thanks http://blog.ekini.net/2009/02/24/jquery-getting-the-latest-textvalue-inside-a-textarea/
-            var value = $(this).attr('value');
+            var value = $(this).val();
             //fix for issue 7 (http://plugins.jquery.com/node/13503 and http://github.com/erikzaadi/jQueryPlugins/issues#issue/7)
             if ($.browser.mozilla && this.firstChild) {
                 this.firstChild.textContent = value;

data/app/controllers/form_answers_controller.rb

@@ -16,4 +16,18 @@ class FormAnswersController < ApplicationController
     respond_with ActiveadminSelleoCms::FormAnswer.where(form_uuid: params[:form_uuid])
   end
 
+  def edit
+    @form_answer = ActiveadminSelleoCms::FormAnswer.find(params[:id])
+  end
+
+  def update
+    @form_answer = ActiveadminSelleoCms::FormAnswer.find(params[:id])
+    @form_answer.update_attributes(params[:form_answer])
+  end
+
+  def find_or_create
+    @form_answer = ActiveadminSelleoCms::FormAnswer.find_or_create_by_form_uuid_and_dom_id_and_form_question_id(params[:form_uuid], params[:dom_id], params[:form_question_id])
+    render action: :edit
+  end
+
 end

data/app/controllers/forms_controller.rb

@@ -6,9 +6,14 @@ class FormsController < ApplicationController
   end
 
   def download
+    ActiveadminSelleoCms::FormAnswer.where(form_uuid: params[:form_uuid])
+
     respond_to do |format|
       format.pdf do
-        render :pdf => @form.title.parameterize
+        render :pdf => @form.title.parameterize, :show_as_html => false
+      end
+      format.html do
+        render :pdf => @form.title.parameterize, :show_as_html => true
       end
     end
   end
@@ -16,21 +21,12 @@ class FormsController < ApplicationController
   def deliver
     respond_to do |format|
       format.html do
-        pdf = WickedPdf.new.pdf_from_string(
-            render_to_string('download.pdf.erb')
-        )
-        pdf_path = File.join(ActiveadminSelleoCms::Form::PDF_PATH, "#{@form.title.parameterize}-#{Time.now.to_s.parameterize}.pdf")
-        File.open(pdf_path, 'wb') do |file|
-          file << pdf
-        end
-        ActiveadminSelleoCms::FormMailer.form_submission(pdf_path).deliver
+        ActiveadminSelleoCms::FormMailer.form_submission(@form, params[:form_uuid]).deliver
         flash[:notice] = "Your form has been sent. Thank you."
       end
     end
   end
 
-  def answer
-
-  end
+  def answer; end
 
 end

data/app/mailers/activeadmin_selleo_cms/form_mailer.rb

@@ -2,8 +2,9 @@ module ActiveadminSelleoCms
   class FormMailer < ActionMailer::Base
     default from: "web-form@jips.org"
 
-    def form_submission(form_filename)
-      attachments[form_filename] = File.read(form_filename)
+    def form_submission(form, form_uuid)
+      @form = form
+      @form_uuid = form_uuid
       mail(to: 'aossowski@gmail.com', subject: "New form submission")
     end
   end

data/app/models/activeadmin_selleo_cms/form_answer.rb

@@ -1,8 +1,12 @@
 module ActiveadminSelleoCms
   class FormAnswer < ActiveRecord::Base
-    attr_accessible :form_uuid, :dom_id, :form_id, :form_question_id, :value
+    attr_accessible :form_uuid, :dom_id, :form_id, :form_question_id, :value, :data
     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
 
@@ -12,5 +16,21 @@ module ActiveadminSelleoCms
       end
     end
 
+    def self.value_for(form_uuid, dom_id)
+      if answer = self.where(form_uuid: form_uuid, dom_id: dom_id).first
+        answer.value
+      else
+        nil
+      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
+      else
+        nil
+      end
+    end
+
   end
 end

data/app/views/activeadmin_selleo_cms/form_mailer/form_submission.html.erb

@@ -4,9 +4,9 @@
   <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
 </head>
 <body>
-<h3>New form has been submitted.</h3>
+<h3>New form has been submitted!</h3>
 <p>
-  Please see the attachmed file.
+  <%= link_to "Click here for details.", "/forms/#{@form.id}/download?form_uuid=#{@form_uuid}" %>
 </p>
 </body>
 </html>

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

@@ -0,0 +1,5 @@
+= 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

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

@@ -0,0 +1 @@
+= render partial: 'form'

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

@@ -0,0 +1,2 @@
+$('#popup').effect('highlight');
+$('#popup form').html('<%= j render partial: 'form' %>');

data/app/views/forms/_download.erb

@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <%= wicked_pdf_stylesheet_link_tag "components/forms" -%>
+</head>
+<body>
+
+<%= 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 %>">
+        <div class="questions_labels">
+          <%= label_tag dom_id(question), question.title %>
+          <% if question.hint.present? %>
+              <p class="hint"><%=  question.hint  %></p>
+          <% end %>
+        </div>
+        <% if [:check_box_tag].include? question.input_type %>
+            <div class="questions_options">
+              <% question.options.each do |option| %>
+                  <%= send(question.input_type, "#{dom_id(question)}[]", option.id, ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(option))=="true", required: question.is_required, id: dom_id(option), data: {form_question_id: question.id} ) %>
+                  <%= label_tag dom_id(option), option.title %>
+              <% end %>
+              <%= 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 [:radio_button_tag].include? question.input_type %>
+            <div class="questions_options">
+              <% question.options.each do |option| %>
+                  <%= send(question.input_type, dom_id(question), option.id, ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(option)), required: question.is_required, id: dom_id(option), data: {form_question_id: question.id}) %>
+                  <%= label_tag dom_id(option), option.title %>
+              <% end %>
+              <%= 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;" %>
+        <% 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 %>
+      </li>
+  <% end %>
+</ol>
+<% end %>
+
+</body>
+</html>

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

@@ -2,37 +2,59 @@
   <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), 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), data: {form_question_id: question.id}) %>
-                <%= label_tag dom_id(option), option.title %>
+        <div class="questions_labels">
+            <%= label_tag dom_id(question), question.title %>
+            <% if question.hint.present? %>
+                <p class="hint"><%=  question.hint  %></p>
             <% end %>
+        </div>
+        <% if [:check_box_tag].include? question.input_type %>
+            <div class="questions_options">
+                <% question.options.each do |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 %>
+                <%= text_field_tag "#{dom_id(question)}_other", "", data: {form_question_id: question.id} if question.has_other_option %>
+            </div>
+      <% elsif [:radio_button_tag].include? question.input_type %>
+            <div class="questions_options">
+                <% question.options.each do |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 %>
+                <%= text_field_tag "#{dom_id(question)}_other", "", data: {form_question_id: question.id} if question.has_other_option %>
+            </div>
         <% 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}) %>
+            <%= button_to_function "Select file", "fileUpload('#{dom_id(form)}', '#{dom_id(question)}', #{question.id})", style: "padding: 5px;" %>
         <% else %>
             <%= 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", "", 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'});" %>
-<%= button_to_function "Download", "$('##{dom_id(form)}').attr('action', '/forms/#{form.id}/download.pdf').submit();" %>
-<%= button_to_function "Send to JIPS", "$('##{dom_id(form)}').attr('action', '/forms/#{form.id}/deliver').submit();" %>
+<%= button_to_function "Print", "$('##{dom_id(form)}').printElement({printMode:'popup'});", class: 'print', title: 'Print' %>
+<%= button_to_function "Download PDF", "downloadPDF(#{form.id}, '#{dom_id(form)}')", class: 'save', title: 'Download PDF' %>
+<%= button_to_function "Download", "download(#{form.id}, '#{dom_id(form)}')", class: 'save', title: 'Download' %>
+<%= button_to_function "Send to JIPS", "deliver(#{form.id}, '#{dom_id(form)}')", class: 'send' %>
 
 <script>
   $(function(){
       setupCmsForm('<%= dom_id(form) %>');
   });
+
+  function downloadPDF(form_id, form_dom_id){
+      window.location='/forms/'+form_id+'/download.pdf?form_uuid='+localStorage[form_dom_id];
+  }
+
+  function download(form_id, form_dom_id){
+      window.location='/forms/'+form_id+'/download?form_uuid='+localStorage[form_dom_id];
+  }
+
+  function deliver(form_id, form_dom_id) {
+      if ($('#'+form_dom_id).valid() == true) {
+          window.location='/forms/'+form_id+'/deliver?form_uuid='+localStorage[form_dom_id];
+      }
+  }
 </script>

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

@@ -0,0 +1 @@
+<%= render partial: 'download'%>

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

@@ -1,16 +1 @@
-<%= form_tag '/forms', multipart: true, id: dom_id(@form) do %>
-    <% @form.questions.each do |question| %>
-        <%= label_tag dom_id(question), question.title %>
-        <% if [:check_box_tag, :radio_button_tag].include? question.input_type %>
-            <% question.options.each do |option| %>
-                <%= 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 %>
-        <%= text_field_tag "#{dom_id(question)}_other", params["#{dom_id(question)}_other"] if question.has_other_option %>
-    <% end %>
-<% end %>
+<%= render partial: 'download'%>

data/config/routes.rb

@@ -3,12 +3,16 @@ Rails.application.routes.draw do
 
   resources :forms, :only => [] do
     member do
-      post :download
-      post :deliver
+      get :download
+      get :deliver
     end
   end
 
-  resources :form_answers, :only => [:create, :index]
+  resources :form_answers do
+    collection do
+      post :find_or_create
+    end
+  end
 
   scope ":locale", :locale => /\w{2}/ do
     scope "search" do

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -441,7 +441,9 @@ files:
 - app/assets/javascripts/activeadmin-selleo-cms/jquery.browser.js
 - app/assets/javascripts/activeadmin-selleo-cms/inline-editing.js
 - app/assets/javascripts/activeadmin-selleo-cms/forms.js
+- app/views/forms/download.html.erb
 - app/views/forms/deliver.html.erb
+- app/views/forms/_download.erb
 - app/views/forms/_form.html.erb
 - app/views/forms/download.pdf.erb
 - app/views/admin/sections/_form.html.haml
@@ -494,6 +496,9 @@ files:
 - app/views/searches/show.html.haml
 - app/views/layouts/activeadmin_selleo_cms/application.html.erb
 - app/views/active_admin/resource/update.js
+- app/views/form_answers/_form.html.haml
+- app/views/form_answers/update.js.erb
+- app/views/form_answers/edit.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