scrivito_crm_form_widget 0.1.3 → 0.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43a0a25760b9265c7ccef43eba38980b5f20b1d
-  data.tar.gz: 98eb6fb7a70cfc9f661611cbd105c064a7e855fa
+  metadata.gz: ac77b44eb5e2e7bfee8460cac4971f710d86c81c
+  data.tar.gz: 84a9d7aef19eb87b54538347feacde41b58482b1
 SHA512:
-  metadata.gz: 3567cdf96cebe341f857db8e0069e184bd26f93f2197911cdd1f357c33fc3e737b1da2b2d72a936faa9d7019243edbd77bf486c9bd701feb1afb34c33238052e
-  data.tar.gz: 6bf225abbefdaa9a864f1f14e197ea9efe40751d3c5f18b8a655db55321d4155f9cbc2bd00f4c6e02be8b942f728bfe6886856cc22ef38e3d6dd6e7391c2a880
+  metadata.gz: e728681e8c89a0d3ac48699c567e8b413757e08107676fe13dd9086fab81be0b467d6ec6e354bd70a2cb9643454d845963c7b7704fe2c28fd70a4a2756983dfe
+  data.tar.gz: 782e84b8c0f4a0c92599db7cbe1b47732b6f14dcf8b8d79aee2eb6f119edcbe994e9c8fe7003ac577191d89b159fd6784478087346db0020ce8e8393b9c095c1

data/app/assets/styles/scrivito_crm_form_widget.css

@@ -1,3 +1,3 @@
-/*
- *= require scrivito_advanced_editors
- */
+form .form-group.last {
+  display: none;
+}

data/app/models/crm_form_widget.rb

@@ -7,9 +7,14 @@ class CrmFormWidget < Widget
   attribute :tags, :string
   attribute :redirect_to, :reference
   attribute :submit_button_text, :string
+  attribute :dynamic_attributes, :widgetlist
+
+  def valid_widget_classes_for(field_name)
+    [DynamicAttributeWidget]
+  end
 
   def self.activities
-    Obj.try(:crm_activity_filter) || Crm::Type.all.select {|i| i.item_base_type == "Activity"}
+    @activities ||= Obj.try(:crm_activity_filter) || Crm::Type.all.select {|i| i.item_base_type == "Activity"}
   end
 
   def attributes
@@ -29,6 +34,22 @@ class CrmFormWidget < Widget
   end
 
   def self.events
-    Obj.try(:crm_activity_filter) || Crm::Event.all.to_a
+    @events ||= Obj.try(:crm_activity_filter) || Crm::Event.all.to_a
+  end
+
+  def self.event_ids
+    CrmFormWidget.events.map {|e| e.id}
+  end
+
+  def self.event_names
+    name_hash = {}
+    CrmFormWidget.events.each do |e|
+      name_hash[e.id] = e.title
+    end
+    return name_hash
+  end
+
+  def self.activity_ids
+    CrmFormWidget.activities.map {|a| a.id}
   end
 end

data/app/models/dynamic_attribute_widget.rb

@@ -0,0 +1,23 @@
+class DynamicAttributeWidget < Widget
+  attribute :title, :string
+  attribute :label, :string
+  attribute :type, :enum, values: ['string','text','enum','multienum'], default: 'string'
+  attribute :valid_values, :stringlist
+  attribute :maxlength, :string, default: 100
+
+  def self.valid_container_classes
+    [CrmFormWidget]
+  end
+
+  def options
+    {
+      'valid_values' => valid_values,
+      'maxlength' => maxlength
+    }
+  end
+
+  def field_name
+    field = title.parameterize('_')
+    return "dynamic_#{field}"
+  end
+end

data/app/presenter/crm_form_presenter.rb

@@ -1,4 +1,5 @@
-class CrmFormPresenter < CrmFormAttributes
+class CrmFormPresenter
+  include ActiveModel::Model
 
   def attribute_names
     @type.standard_attrs.keys + @type.custom_attrs.keys
@@ -11,37 +12,59 @@ class CrmFormPresenter < CrmFormAttributes
     @params = request.params["crm_form_presenter"]
 
     if request.post? && widget.id == @params[:widget_id]
-      @params.delete("widget_id")
       redirect_after_submit(controller, widget, self.submit)
     end
   end
 
   def submit
-    contact = nil
-
-    if @params['custom_email'] && @params['custom_last_name']
-      contact = manipulate_or_create_user
+    if @params['email'].present?
+      raise 'No human exeception'
+    else
+      @params.delete('email')
     end
+    prepare_contact(@params['custom_email'], @params['custom_last_name'])
+    prepare_activity_params
+    Crm::Activity.create(@params)
+    return {status: "success", message: "Your form was send successfully"}
+  rescue Crm::Errors::InvalidValues => e
+    return {status: "error", message: e.validation_errors}
+  end
 
-    if contact
-      set_params_for_activty(contact)
-      add_contact_to_event(contact) if @widget.event_id.present?
-    end
+  private
+  def prepare_activity_params
+    dynamic_params = set_dynamic_params
+    @params[:comment_notes] = dynamic_params if dynamic_params.present?
 
+    @params.delete("widget_id")
     @params["title"] = @params[:title].empty? ? @activity.id : @params[:title]
     @params["type_id"] = @activity.id
     @params["state"] = @activity.attributes['states'].first
+  end
 
-    activity = Crm::Activity.create(@params)
+  def set_dynamic_params
+    dynamic_params = {};
+    @params.each do |key, value|
+      if key.starts_with? 'dynamic_'
+        dynamic_params[key] = value
+        @params.delete(key)
+      end
+    end
+    return dynamic_params
+  end
 
-    return {status: "success", message: "Your form was send successfully"}
-  rescue Crm::Errors::InvalidValues => e
-    return {status: "error", message: e.validation_errors}
+
+  def prepare_contact(email, last_name)
+    if email && last_name
+      contact = manipulate_or_create_user(email, last_name)
+      if contact
+        set_params_for_activty(contact)
+        add_contact_to_event(contact) if @widget.event_id.present?
+      end
+    end
   end
 
-  private
-  def manipulate_or_create_user
-    contact = Crm::Contact.where(:email, :equals, @params['custom_email']).and(:last_name, :equals, @params['custom_last_name']).first
+  def manipulate_or_create_user(email, last_name)
+    contact = Crm::Contact.where(:email, :equals, email).and(:last_name, :equals, last_name).first
     unless contact
       contact = Crm::Contact.create({
         first_name: @params['custom_first_name'],

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

@@ -1,5 +1,5 @@
 <div class="form-group">
-  <%= form.label name.to_sym, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
+  <%= 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">

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

@@ -1,13 +1,13 @@
 <div class="form-group">
-  <%= form.label name.to_sym, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
+  <%= 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="^checkbox">
+      <div class="checkbox">
         <%= form.label "#{name}_#{value.downcase}" do %>
-          <%= form.check_box name.to_sym, value %>
-          <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.downcase}") %>
+          <%= form.check_box name.to_sym, {:multiple => true, id: "crm_form_presenter_#{name}_#{value.downcase}"}, value, nil %>
+          <%= t("helpers.label.crm_form_presenter.#{name}_option.#{value.downcase}", default: value) %>
         <% end %>
       </div>
     <% end %>
   </div>
-</div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="form-group">
-  <%= form.label name.to_sym, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
+  <%= 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] %>
   </div>

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

@@ -1,5 +1,5 @@
 <div class="form-group">
-  <%= form.label name.to_sym, class: "control-label col-sm-3 #{options[:mandatory] ? 'mandatory' : ''}" %>
+  <%= 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] %>
   </div>

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

@@ -0,0 +1,5 @@
+<% attributes.each do |attribute| %>
+  <% name, type = attribute.split(':') %>
+  <%= name %>
+  <%= type %>
+<% end %>

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

@@ -6,9 +6,21 @@
   <%= form.hidden_field(:widget_id, value: widget.id) %>
 
   <% widget.attributes.each do |name, options| %>
-    <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options %>
+    <% CrmFormPresenter.send(:attr_accessor, name.to_sym) %>
+    <%= render "crm_form_widget/crm_#{options["attribute_type"]}", form: form, name: name, options: options, label: nil %>
   <% 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 %>
+  <% end %>
+
+  <div class="form-group last">
+    <label class="control-label col-sm-3" for="crm_form_presenter_email">Email</label>
+    <div class="col-sm-9">
+      <input class="form-control" type="text" name="crm_form_presenter[email]" id="crm_form_presenter_email">
+    </div>
+  </div>
   <%= form.submit widget.submit_button, class: "btn btn-primary pull-right" %>
 
 <% end %>

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

@@ -1,47 +1,51 @@
-<ul class="tab-list">
-  <li class="active" data-panel-target="#edit-general">General</li>
-  <li data-panel-target="#edit-tags">Tags</li>
-  <li data-panel-target="#edit-activity">Activity</li>
-  <li data-panel-target="#edit-event">Event</li>
-</ul>
+<%= scrivito_large_dialog do %>
+  <ul class="tab-list">
+    <li class="active" data-panel-target="#edit-general">General</li>
+    <li data-panel-target="#edit-tags">Tags</li>
+    <li data-panel-target="#edit-activity">Activity</li>
+    <li data-panel-target="#edit-event">Event</li>
+    <li data-panel-target="#edit-dynamic">Add fields</li>
+  </ul>
 
-<div class="tab-panels">
-  <div class="tab-panel" id="edit-general">
-    <%= scrivito_details_for 'Subject' do %>
-      <%= scrivito_tag :div, widget, :subject %>
-    <% end %>
-    <%= scrivito_details_for 'Redirect after submit' do %>
-      <%= scrivito_tag :div, widget, :redirect_to %>
-    <% end %>
+  <div class="tab-panels">
+    <div class="tab-panel" id="edit-general">
+      <%= scrivito_details_for 'Subject' do %>
+        <%= scrivito_tag :div, widget, :subject %>
+      <% end %>
+      <%= scrivito_details_for 'Redirect after submit' do %>
+        <%= scrivito_tag :div, widget, :redirect_to %>
+      <% end %>
 
-    <%= scrivito_details_for 'Text on submitbutton' do %>
-      <%= scrivito_tag :div, widget, :submit_button_text %>
-    <% end %>
-  </div>
+      <%= scrivito_details_for 'Text on submitbutton' do %>
+        <%= scrivito_tag :div, widget, :submit_button_text %>
+      <% end %>
+    </div>
 
-  <div class="tab-panel" id="edit-tags">
-    <%= scrivito_details_for 'Tags for Contact' do %>
-      <div class="alert alert-info">
-        optional attribute. can be used to add tags to a contact like has_visited_event. contatc will be calculated by the custom attributes email and last_name of your selected activtiy. If this fields do not exist, this field has no effect.
-      </div>
-      <%= scrivito_tag :div, widget, :tags, data: {editor: 'scrivito-list-editor'} %>
-    <% end %>
-  </div>
+    <div class="tab-panel" id="edit-tags">
+      <%= scrivito_details_for 'Tags for Contact' do %>
+        <%= scrivito_tag :div, widget, :tags, data: {editor: 'scrivito-list-editor'} %>
+      <% end %>
+      <%= scrivito_colapsable_for 'What is this for?', 'help small mark' do %>
+        Optional attribute. Can be used to add tags to a contact like has_visited_event. Contatc will be calculated by the custom attributes email and last_name of your selected activtiy. If one of this fields at the crm activity do not exist, this attribute has no effect.
+      <% end %>
+    </div>
 
-  <div class="tab-panel" id="edit-activity">
-    <%= scrivito_details_for 'Activity' do %>
-      <%= scrivito_toggle_button_editor widget, :activity_id, CrmFormWidget.activities.map { |a| a.id } %>
-    <% end %>
-  </div>
+    <div class="tab-panel" id="edit-activity">
+      <%= scrivito_details_for 'Activity' do %>
+        <%= scrivito_tag(:div, widget, :activity_id, data: {toggle_button_list: CrmFormWidget.activity_ids}) %>
+      <% end %>
+    </div>
 
-  <div class="tab-panel" id="edit-event">
-    <%= scrivito_details_for 'Event' do %>
-      <%- scrivito_toggle_button_editor(widget, :event_id, CrmFormWidget.events) do |event| %>
-        <%= scrivito_tag(:button, widget, :event_id, data: {editor: 'scrivito-toggle-button', content: event.id}) do %>
-          <%= event.title %>
-        <% end %>
+    <div class="tab-panel" id="edit-event">
+      <%= scrivito_details_for 'Event' do %>
+        <%= scrivito_tag(:div, widget, :event_id, data: {
+          toggle_button_list: CrmFormWidget.event_ids,
+          toggle_button_caption: CrmFormWidget.event_names }) %>
       <% end %>
-    <% end %>
-  </div>
-</div>
+    </div>
 
+    <div class="tab-panel" id="edit-dynamic">
+      <%= scrivito_tag :div, widget, :dynamic_attributes %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,26 @@
+<%= scrivito_colapsable_for 'Attribute' do %>
+  <%= scrivito_details_for do %>
+    <h4>Type</h4>
+    <%= scrivito_tag :div, widget, :type %>
+  <% end %>
+
+  <%= scrivito_details_for do %>
+    <h4>Label</h4>
+    <%= scrivito_tag :div, widget, :label %>
+  <% end %>
+
+  <%= scrivito_details_for do %>
+    <h4>Title</h4>
+    <%= scrivito_tag :div, widget, :title %>
+  <% end %>
+
+  <%= scrivito_details_for do %>
+    <h4>Maxlength</h4>
+    <%= scrivito_tag :div, widget, :maxlength %>
+  <% end %>
+
+  <%= scrivito_details_for do %>
+    <h4>Values <small>Mandatory for type enum or multienum</small></h4>
+    <%= scrivito_tag :div, widget, :valid_values %>
+  <% end %>
+<% end %>

data/lib/scrivito_crm_form_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoCrmFormWidget
-  VERSION = "0.1.3"
+  VERSION = "0.7.0.rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_crm_form_widget
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.7.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: scrivito_sdk
+  name: scrivito
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,15 +108,18 @@ files:
 - app/assets/styles/scrivito_crm_form_widget.css
 - app/controllers/scrivito_crm_form_widget/application_controller.rb
 - app/models/crm_form_widget.rb
+- app/models/dynamic_attribute_widget.rb
 - app/presenter/crm_form_presenter.rb
 - app/views/crm_form_widget/_crm_enum.html.erb
 - app/views/crm_form_widget/_crm_multienum.html.erb
 - app/views/crm_form_widget/_crm_string.html.erb
 - app/views/crm_form_widget/_crm_text.html.erb
+- app/views/crm_form_widget/_dynamic_attributes.html.erb
 - app/views/crm_form_widget/_form.html.erb
 - app/views/crm_form_widget/details.html.erb
 - app/views/crm_form_widget/show.html.erb
 - app/views/crm_form_widget/thumbnail.html.erb
+- app/views/dynamic_attribute_widget/details.html.erb
 - lib/scrivito_crm_form_widget.rb
 - lib/scrivito_crm_form_widget/engine.rb
 - lib/scrivito_crm_form_widget/version.rb
@@ -137,9 +140,9 @@ 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