scrivito_crm_form_widget 0.7.2 → 0.8.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df69e5892b774095bf4e3f3c0a67469b5f6e011
-  data.tar.gz: 72304fda911f065c2b36cd26d9ef72912a57ddc0
+  metadata.gz: 165d85e828c452d6827e8465161f568447c285d3
+  data.tar.gz: 7902487559b63f09494ebaa79078729fdbec789c
 SHA512:
-  metadata.gz: b3527be2dca5e6c7fcbdaf0c006209df65ed97b294ae50083fa7db58019ce5b99ce4ab39e90cd1bffd548784592a245b0364ca9cf5bc5f35a8d999a8970c5e57
-  data.tar.gz: dc64359312e566645a60093da7fa3b040fd45afb93eabd714cd9432b2d4ff461dd8f3892bc4b348c650581a170fef367716ec75dc892785c751689d4c0dddbac
+  metadata.gz: 1280f07793e61e4b6773f81f12515d9f5c3812982211d6a97b84b6c12cf72081337a089942e2159395ab20e43b73ee1e9b12b69e05af3afa9d802bf9c01f7a6e
+  data.tar.gz: f95246027994f68484ee8259528d2a726b27f64e3b749368ab8ee9828ac72e6f9e87afdd14d963ffec234fa564a403f8289662c322b64f13c287c3dcb02ef8d1

data/Rakefile

@@ -4,16 +4,6 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ScrivitoJrFormWidget'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 
 
 

data/app/assets/styles/scrivito_crm_form_widget.scss

@@ -0,0 +1,30 @@
+form .form-group.last {
+  display: none;
+}
+
+form.form-horizontal.label-position-top {
+  label {
+    float: none;
+    width: 100%;
+    text-align: left;
+  }
+  .col-sm-9 {
+    width: 100%;
+    float: none;
+  }
+}
+
+form.form-horizontal.two-column-layout {
+  margin: 0 -15px;
+  .form-group {
+    width: 50%;
+    float: left;
+    margin: 0;
+  }
+
+  .btn {
+    clear: both;
+    margin-right: 15px;
+  }
+}
+

data/app/models/crm_form_widget.rb

@@ -8,6 +8,8 @@ class CrmFormWidget < Widget
   attribute :redirect_to, :reference
   attribute :submit_button_text, :string
   attribute :dynamic_attributes, :widgetlist
+  attribute :label_position, :enum, values: ['left','top'], default: 'left'
+  attribute :columns, :enum, values: ['one','two'], default: 'one'
 
   def valid_widget_classes_for(field_name)
     [DynamicAttributeWidget]
@@ -52,4 +54,8 @@ class CrmFormWidget < Widget
   def self.activity_ids
     CrmFormWidget.activities.map {|a| a.id}
   end
+
+  def field_as_select?(options)
+    columns == 'two' || options['valid_values'].count > 5
+  end
 end

data/app/presenter/crm_form_presenter.rb

@@ -10,8 +10,12 @@ class CrmFormPresenter
     @activity = widget.activity
     @page = widget.obj
     @params = request.params["crm_form_presenter"]
+    @dynamic_params = set_dynamic_params
+    errors = validate_params
 
-    if request.post? && widget.id == @params[:widget_id]
+    if errors.present?
+      return {status: "error", message: errors}
+    elsif request.post? && widget.id == @params[:widget_id]
       redirect_after_submit(controller, widget, self.submit)
     end
   end
@@ -32,8 +36,7 @@ class CrmFormPresenter
 
   private
   def prepare_activity_params
-    dynamic_params = set_dynamic_params
-    @params[:comment_notes] = dynamic_params if dynamic_params.present?
+    @params[:comment_notes] = @dynamic_params if @dynamic_params.present?
 
     @params.delete("widget_id")
     @params["title"] = @params[:title].empty? ? @activity.id : @params[:title]
@@ -43,7 +46,7 @@ class CrmFormPresenter
 
   def set_dynamic_params
     dynamic_params = {};
-    @params.each do |key, value|
+    (@params || []).each do |key, value|
       if key.starts_with? 'dynamic_'
         dynamic_params[key] = value
         @params.delete(key)
@@ -118,4 +121,15 @@ class CrmFormPresenter
       controller.redirect_to("/#{@page.id}", alert: submit_message[:message])
     end
   end
+
+  def validate_params
+    return false if @params.nil?
+    email = validate_email(@params['custom_email'])
+    hook = Obj.respond_to?('crm_form_validation') ? Obj.crm_form_validation(@params) : false
+    email || hook
+  end
+
+  def validate_email(email)
+    email.present ? /.+@.+\..+/i.match(email).present? : false
+  end
 end

data/app/views/crm_form_widget/_crm_enum.html.erb

@@ -1,13 +1,17 @@
-<div class="form-group">
+<div class="form-group form-field-<%= name %>">
   <%= form.label name.to_sym, label, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
   <div class="col-sm-9">
-    <% options['valid_values'].each do |value| %>
-      <div class="radio">
-        <%= form.label "#{name}_#{value.downcase}" do %>
-          <%= form.radio_button name.to_sym, value %>
-          <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.downcase}") %>
-        <% end %>
-      </div>
+    <% if widget.field_as_select?(options) %>
+      <%= form.select(name.to_sym, options_for_select(options['valid_values'].map { |u| [u, u.downcase] })) %>
+    <% else %>
+      <% options['valid_values'].each do |value| %>
+        <div class="radio">
+          <%= form.label "#{name}_#{value.downcase}" do %>
+            <%= form.radio_button name.to_sym, value %>
+            <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.downcase}") %>
+          <% end %>
+        </div>
+      <% end %>
     <% end %>
   </div>
 </div>

data/app/views/crm_form_widget/_crm_multienum.html.erb

@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group form-field-<%= name %>">
   <%= form.label name.to_sym, label, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
   <div class="col-sm-9">
     <% options['valid_values'].each do |value| %>

data/app/views/crm_form_widget/_crm_string.html.erb

@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group form-field-<%= name %>">
   <%= form.label name.to_sym, label, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
   <div class="col-sm-9">
     <%= form.text_field name.to_sym, class: "form-control", maxlength: options[:maxlength] %>

data/app/views/crm_form_widget/_crm_text.html.erb

@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group form-field-<%= name %>">
   <%= form.label name.to_sym, label, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
   <div class="col-sm-9">
     <%= form.text_area name.to_sym, class: "form-control", maxlength: options[:maxlength] %>

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

@@ -1,4 +1,4 @@
-<%= form_for CrmFormPresenter.new(widget, request, controller), url: scrivito_path(widget.obj), html: { class: "form-horizontal"} do |form| %>
+<%= form_for CrmFormPresenter.new(widget, request, controller), url: scrivito_path(widget.obj), html: { class: "form-horizontal clearfix label-position-#{widget.label_position} #{widget.columns}-column-layout"} do |form| %>
   <% if widget.subject %>
     <%= form.hidden_field(:title, value: widget.subject) %>
   <% end %>
@@ -7,12 +7,12 @@
 
   <% widget.attributes.each do |name, options| %>
     <% CrmFormPresenter.send(:attr_accessor, name.to_sym) %>
-    <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options, label: nil %>
+    <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options, label: nil, widget: widget %>
   <% end %>
 
   <% widget.dynamic_attributes.each do |attribute| %>
     <% CrmFormPresenter.send(:attr_accessor, attribute.field_name.to_sym) %>
-    <%= render "crm_form_widget/crm_#{attribute.type}", form: form, name: attribute.field_name, options: attribute.options || {}, label: attribute.label %>
+    <%= render "crm_form_widget/crm_#{attribute.type}", form: form, name: attribute.field_name, options: attribute.options || {}, label: attribute.label, widget: widget %>
   <% end %>
 
   <div class="form-group last">

data/app/views/crm_form_widget/details.html.erb

@@ -19,6 +19,14 @@
       <%= scrivito_details_for t('scrivito_crm_form_widget.details.submit_button_text', default: 'Text on submit button') do %>
         <%= scrivito_tag :div, widget, :submit_button_text %>
       <% end %>
+
+      <%= scrivito_details_for t('scrivito_crm_form_widget.details.label_position', default: 'Label Position') do %>
+        <%= scrivito_tag :div, widget, :label_position %>
+      <% end %>
+
+      <%= scrivito_details_for t('scrivito_crm_form_widget.details.columns', default: 'Columns') do %>
+        <%= scrivito_tag :div, widget, :columns %>
+      <% end %>
     </div>
 
     <div class="tab-panel" id="edit-tags">

data/lib/scrivito_crm_form_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoCrmFormWidget
-  VERSION = "0.7.2"
+  VERSION = "0.8.0.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_crm_form_widget
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0.beta2
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrivito
@@ -77,7 +77,7 @@ files:
 - Rakefile
 - app/assets/images/widgets/scrivito_crm_form_widget.png
 - app/assets/scripts/scrivito_crm_form_widget.js
-- app/assets/styles/scrivito_crm_form_widget.css
+- app/assets/styles/scrivito_crm_form_widget.scss
 - app/controllers/scrivito_crm_form_widget/application_controller.rb
 - app/models/crm_form_widget.rb
 - app/models/dynamic_attribute_widget.rb
@@ -112,12 +112,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A widget for Scrivito to show a form using Infopark CRM api v2.0.

data/app/assets/styles/scrivito_crm_form_widget.css

@@ -1,3 +0,0 @@
-form .form-group.last {
-  display: none;
-}