visual_condition_builder 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5efbc1e1e60c13d256b4fec51886eb21f209c1
-  data.tar.gz: b4c2d18b2e3ede0ae1a0c48ad86fd36de2b409c8
+  metadata.gz: 29c7b9f0c2676e707c087a1f800b69bb51d2db65
+  data.tar.gz: 5a6f334ce10f479ed1b6a5666eab2d9a0d46b991
 SHA512:
-  metadata.gz: 07cbfd797610edb9b85ee44c05da413c496bc28888aea3563c11d6b013e000067df56f05d7d2c8aec0507a2dc3abb33eeb04269222866c6b0c6fedc101f70949
-  data.tar.gz: 83b5ec6de8d1f239908e932a7f33c7bcfef7cf3ecae69637230f8b3968d74865817bf04118b31fde339727ae8cbcb61adaa40a92f6500cec38e938efea35e1dc
+  metadata.gz: c65a6b40f4fb6ed9e7a5afb218c0c5df3e4f45814c8fe798b1c5b19be56d2bfd38b18eb1dfb6fe1389291ad46db6522b01c6e551182631a2fb8d372dc7cba491
+  data.tar.gz: 4813cea48ec606be4c682b50e1b68b5358a3f6e7ec3c4efa1059465db216d90c391cb934fc33d6d812f3332ded2c0165bf9336e5c1107c9a17f7f08ec47753a3

data/app/assets/javascripts/visual_condition_builder/condition_builder.js

@@ -164,7 +164,11 @@
         plugin.load_values_from_input = function (element_input) {
             var $elInput = $(element_input);
             if ($elInput.length > 0) {
-                plugin.parameters.values = JSON.parse($elInput.val());
+                try {
+                    plugin.parameters.values = JSON.parse($elInput.val());
+                } catch(e) {
+                    plugin.parameters.values = '';
+                }
             }
             plugin.load_values(plugin.parameters.values);
         }; //END load_values_from_input
@@ -639,5 +643,28 @@ $(document).on('click', '.add-condition-field', function (ev) {
     var container = $(this).closest('.add-condition').attr('data-target');
     var field_name = $(this).attr('data-field');
     var $conditionBuilder = $(container).data('conditionBuilder');
+    console.log('a');
     $conditionBuilder.add_condition(field_name);
-});
+});
+
+//DROPDOWN WITH SEARCH
+$(document).on('keyup','.dropdown-filter-control', function(ev){
+    var ulEl = $(this).closest('ul.dropdown-menu');
+    var searchTerm = $(this).val().toLowerCase();
+    ulEl.find('li.dropdown-menu-item').each(function(){
+        var filter = $(this).filter(function() {
+            return $(this).attr('data-search-term').toLowerCase().indexOf(searchTerm) > -1;
+        });
+        // $(this).filter('[data-search-term *= ' + searchTerm + ']')
+        if (searchTerm.length < 1 || filter.length > 0) {
+            $(this).show();
+        } else {
+            $(this).hide();
+        }
+    });
+});
+
+//AUTO FOCUS
+$(document).on('shown.bs.dropdown', '.dropdown.add-condition', function () {
+    $(this).find('input.dropdown-filter-control:first').focus();
+});

data/app/assets/stylesheets/visual_condition_builder/condition_builder.css

@@ -21,31 +21,32 @@
     display: none !important;
 }
 
-.add-condition {
-    display: inline-block;
-}
+/*.add-condition {*/
+/*display: inline-block;*/
+/*}*/
 
-.add-condition-menu {
-    height: auto;
-    max-height: 200px;
-    overflow-x: hidden;
-}
+/*.add-condition-menu {*/
+/*height: auto;*/
+/*max-height: 200px;*/
+/*overflow-x: hidden;*/
+/*}*/
 
-.add-condition-menu > li > a {
-    display: block;
-    padding: 3px 20px;
-    clear: both;
-    font-weight: 400;
-    line-height: 1.42857143;
-    color: #333;
-    white-space: nowrap;
-}
+/*.add-condition-menu > li > a {*/
+/*display: block;*/
+/*padding: 3px 20px;*/
+/*clear: both;*/
+/*font-weight: 400;*/
+/*line-height: 1.42857143;*/
+/*color: #333;*/
+/*white-space: nowrap;*/
+/*}*/
 
 .condition-builder .remove-condition {
     margin-left: 5px;
     font-size: 16px;
     vertical-align: middle;
 }
+
 .condition-builder .remove-condition:hover {
     text-decoration: none;
 }
@@ -87,6 +88,7 @@
     padding-left: 1.25em;
     cursor: row-resize;
 }
+
 .condition-builder .conditions-move:before {
     content: "";
     position: absolute;
@@ -95,7 +97,16 @@
     width: 1em;
     height: 0.15em;
     background: black;
-    box-shadow:
-            0 0.25em 0 0 black,
-            0 0.5em 0 0 black;
-}
+    box-shadow: 0 0.25em 0 0 black,
+    0 0.5em 0 0 black;
+}
+
+.dropdown-menu-scrollable {
+    height: auto;
+    max-height: 200px;
+    overflow-x: hidden;
+}
+
+.dropdown-menu .dropdown-filter {
+    padding: 0px 0px 0px 3px;
+}

data/app/helpers/visual_condition_builder/application_helper.rb

@@ -27,18 +27,9 @@ txtjs
     def conditions_fields(dictionary)
       dictionary_name = get_dictionary_name(dictionary)
       dictionary_klass = get_dictionary_klass(dictionary)
-      container_name = "#{dictionary_name}_condition_container"
-      capture do
-        content_tag(:div, class: 'dropdown add-condition', data: {target: "##{container_name}"}) do
-          concat(content_tag(:button, class: 'btn btn-default dropdown-toggle', data: {toggle: 'dropdown'}, type: 'button') do
-            concat(I18n.t(:dropdown, default: ['Fields'], scope: [:condition_builder]))
-            concat(content_tag(:span, nil, class:'caret'))
-          end)
-          concat(content_tag(:ul, class: 'dropdown-menu add-condition-menu') do
-            create_conditions_fields_item(dictionary_klass.fields(get_dictionary_context(dictionary)))
-          end)
-        end
-      end
+      @container_name = "##{dictionary_name}_condition_container"
+      @fields = dictionary_klass.fields(get_dictionary_context(dictionary))
+      render partial: 'visual_condition_builder/conditions_fields'
     end
 
     private

data/app/views/visual_condition_builder/_conditions_fields.html.erb

@@ -0,0 +1,13 @@
+<div class="dropdown add-condition" data-target="<%= @container_name %>">
+  <button class="btn btn-default dropdown-toggle" data-toggle="dropdown", data-type="button">
+    <%= I18n.t(:dropdown, default: ['Fields'], scope: [:condition_builder]) %>
+    <span class="caret"></span>
+  </button>
+  <ul class="dropdown-menu dropdown-menu-scrollable add-condition-menu">
+    <li class="dropdown-filter">
+      <input type="text" class="form-control dropdown-filter-control" autocomplete="off" role="textbox" aria-label="Search">
+    </li>
+    <li role="separator" class="divider"></li>
+    <%= render partial: 'visual_condition_builder/conditions_fields_item', locals: {fields: @fields} %>
+  </ul>
+</div>

data/app/views/visual_condition_builder/_conditions_fields_item.html.erb

@@ -0,0 +1,12 @@
+<% fields.each do |field, attrs| %>
+    <% if field.is_a?(Hash) #GROUP %>
+        <li class="dropdown-header dropdown-menu-item">
+          <%= field.values.first %>
+        </li>
+        <%= render partial: 'visual_condition_builder/conditions_fields_item', locals: {fields: attrs} %>
+    <% else %>
+        <li class="dropdown-menu-item" data-search-term="<%= attrs[:label] %>">
+          <a href="#" class="add-condition-field" data-field="<%= field%>"><%= attrs[:label] %></a>
+        </li>
+    <% end %>
+<% end %>

data/lib/visual_condition_builder/converter.rb

@@ -33,5 +33,121 @@ module VisualConditionBuilder
       end
       ransack_q
     end
+
+    def self.to_mongo(params)
+      query = []
+      conditions = params.is_a?(Array) ? params : JSON.parse(params ||= '[]')
+      conditions.map do |p|
+        tmp = {}
+        case p[1].to_s.downcase.to_sym
+          when :eq
+            tmp[p[0]] = p[2]
+          when :not_eq
+            tmp[p[0]] = Hash["$ne", p[2]]
+          when :matches
+            tmp[p[0]] = Hash["$regex",p[2]]
+          when :does_not_match
+            tmp[p[0]] = Hash["$regex","^((?!#{p[2]}).)*$"]
+            tmp[p[0]]["$options"] = "s"
+          when :lt
+            tmp[p[0]] = Hash["$lt",  p[2]]
+          when :gt
+            tmp[p[0]] = Hash["$gt", p[2]]
+          when :lteq
+            tmp[p[0]] = Hash["$lte", p[2]]
+          when :gteq
+            tmp[p[0]] = Hash["$gte", p[2]]
+          when :in
+            tmp[p[0]] = Hash["$in", p[2]]
+          when :not_in
+            tmp[p[0]] = Hash["$nin", p[2]]
+          when :cont
+            tmp[p[0]] = Hash["$regex",p[2]]
+          when :not_cont
+            tmp[p[0]] = Hash["$regex","^((?!#{p[2]}).)*$"]
+            tmp[p[0]]["$options"] = "s"
+          when :cont_any
+            if p[2].is_a?(Array)
+              tmpAny = []
+              p[2].each do |v|
+                tmpAny << Hash[tmp[p[0]], Hash["$regex", v]]
+              end
+              tmp["$or"] = tmpAny
+            end
+          when :not_cont_any
+            if p[2].is_a?(Array)
+              tmpAny = []
+              p[2].each do |v|
+                tmpAny << Hash[tmp[p[0]], Hash["$regex", "^((?!#{v}).)*$", "$options" => "s"]]
+              end
+              tmp["$or"] = tmpAny
+            end
+          when :cont_all
+            if p[2].is_a?(Array)
+              tmpAny = []
+              p[2].each do |v|
+                tmpAny << Hash[tmp[p[0]], Hash["$regex", v]]
+              end
+              tmp["$and"] = tmpAny
+            end
+          when :not_cont_all
+            if p[2].is_a?(Array)
+              tmpAny = []
+              p[2].each do |v|
+                tmpAny << Hash[tmp[p[0]], Hash["$regex", "^((?!#{v}).)*$", "$options" => "s"]]
+              end
+              tmp["$and"] = tmpAny
+            end
+          when :start
+            tmp[p[0]] = Hash["$regex", "^#{p[2]}"]
+          when :not_start
+            tmp[p[0]] = Hash["$regex", "^(?!#{p[2]})"]
+          when :end
+            tmp[p[0]] = Hash["$regex", "#{p[2]}$"]
+          when :not_end
+            tmp[p[0]] = Hash["$regex", "(?<!#{p[2]})$"]
+          when :true
+            tmp[p[0]] = 'true'
+          when :not_true
+            tmp[p[0]] = Hash["$ne", 'true']
+          when :false
+            tmp[p[0]] = 'false'
+          when :not_false
+            tmp[p[0]] = Hash["$ne", 'false']
+          when :present
+            tmp[p[0]] = Hash["$ne", '']
+          when :blank
+            tmp[p[0]] = ''
+          when :null
+            tmp[p[0]] = 'null'
+          when :not_null
+            tmp[p[0]] = Hash["$ne", 'null']
+          when :between
+            if p[2].is_a?(Array)
+              tmp[p[0]]["$gte"] = p[2][0] if p[2][0]
+              tmp[p[0]]["$lte"] = p[2][1] if p[2][1]
+            end
+          when :today
+            tmp[p[0]] = Date.today
+          when :yesterday
+            tmp[p[0]] = Date.yesterday
+          when :tomorrow
+            tmp[p[0]] = Date.tomorrow
+          when :this_week
+            tmp[p[0]] = Hash["$gte", Date.today.beginning_of_week]
+            tmp[p[0]]["$lte"] = Date.today.end_of_week
+          when :last_week
+            tmp[p[0]] = Hash["$gte", 1.week.ago.beginning_of_week]
+            tmp[p[0]]["$lte"] = 1.week.ago.end_of_week
+          when :next_week
+            tmp[p[0]] = Hash["$gte", Date.today.next_week.beginning_of_week]
+            tmp[p[0]]["$lte"] = Date.today.next_week.end_of_week
+          else
+            tmp[p[0]] = Hash[p[1],p[2]]
+        end
+        query << tmp if tmp.present?
+      end
+      query.present? ? Hash["$and", query] : {}
+    end
   end
 end

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Bruno Porto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,6 +100,8 @@ files:
 - app/controllers/application_dictionary.rb
 - app/controllers/visual_condition_builder/application_controller.rb
 - app/helpers/visual_condition_builder/application_helper.rb
+- app/views/visual_condition_builder/_conditions_fields.html.erb
+- app/views/visual_condition_builder/_conditions_fields_item.html.erb
 - config/initializers/assets.rb
 - config/initializers/visual_condition_builder.rb
 - config/locales/visual_condition_builder.en.yml