visual_condition_builder 0.1.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ea07253b9dc8b055f7fc38fd0fa0d0e966d37b3
-  data.tar.gz: e59b36b297760866d4a3e4a87565432ec8ef7af5
+  metadata.gz: f82b832c1d6f0be7ab2ad7a6c4d025ba89b27a2c
+  data.tar.gz: a14f601b2bf2d7fef39b8e2382c0ec25f28ec738
 SHA512:
-  metadata.gz: 1c6d56f57ece6ebdf922c2030ab94dbe9b0c067df49650c3b68a707d91d487a53c3242612477eaeca1463c762e6b1aed21e252c170b6b930deaac020c3ac7aac
-  data.tar.gz: 300c167f4e732e991143da6462bc151652d38ff4b665e6ea240cdf3f615fc15e5743d12e092fe2b98019b2ee4f16c2e8addbae0388ecafb3588ed326e9d01a60
+  metadata.gz: c88f8576de543bcd9a27caabaf5f70e472045d11711bae5d7cd56e0cc17631b9b4a1b1bfce8acef2af470bf1acf53ab51697bf489a267e796838754649b72d74
+  data.tar.gz: 8433a51f5b221621c0b8f0adadf85966010d04d67a16e0885ed214eac8dd79176a3205cec6b65440b7d1d4792adee5dfc803d2365d8384c487e29d2a38d4a4b0

data/README.md

@@ -2,6 +2,10 @@
 
 A great and easy condition builder to your rails project
 
+**BOOTSTRAP 3** : Version 0. ~ 1.
+
+**BOOTSTRAP 4** : Version 2. +
+
 ## How to install
 
 Add it to your **Gemfile**: 

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

@@ -52,11 +52,11 @@
                 field_label = Object.values(fieldObj.group)[0] + ' : ' + field_label;
             }
             block.append('<input id="field_'+new_id+'" data-group-id="'+new_id+'" type="hidden" class="field form-control" value="' + fieldObj.field + '" data-type="' + fieldObj.type + '" />');
-            block.append('<span id="field_name_'+new_id+'" data-group-id="'+new_id+'" class="field_name label label-info">' + field_label + ' <a href="" id="remove_condition_'+new_id+'" data-group-id="'+new_id+'" class="remove-condition">&#10006;</a></span>');
-            block.append('<select id="operators_'+new_id+'" data-group-id="'+new_id+'" class="operators hide form-control"></select>');
-            block.append('<span id="fixed_operator_'+new_id+'" data-group-id="'+new_id+'" class="fixed_operator hide form-control"></span>');
-            block.append('<select id="values_'+new_id+'" data-group-id="'+new_id+'" class="values hide form-control"></select>');
-            block.append('<input id="fixed_value_'+new_id+'" data-group-id="'+new_id+'" class="fixed_value hide form-control" />');
+            block.append('<span id="field_name_'+new_id+'" data-group-id="'+new_id+'" class="field_name tag tag-info">' + field_label + ' <a href="" id="remove_condition_'+new_id+'" data-group-id="'+new_id+'" class="remove-condition">&#10006;</a></span>');
+            block.append('<select id="operators_'+new_id+'" data-group-id="'+new_id+'" class="operators form-control" style="display: none"></select>');
+            block.append('<span id="fixed_operator_'+new_id+'" data-group-id="'+new_id+'" class="fixed_operator form-control" style="display: none"></span>');
+            block.append('<select id="values_'+new_id+'" data-group-id="'+new_id+'" class="values form-control" style="display: none"></select>');
+            block.append('<input id="fixed_value_'+new_id+'" data-group-id="'+new_id+'" class="fixed_value form-control" style="display: none" />');
             if (plugin.parameters.debug == true) {
                 block.append('<p class="expression help-block"></p>');
             }
@@ -96,10 +96,10 @@
             var operators = field.operators;
 
             remove_plugins_elements(groupConditionId);
-            $operators.html('').addClass('hide');
-            $fixedOperator.val('').addClass('hide');
-            $values.html('').addClass('hide');
-            $fixedValue.val('').addClass('hide');
+            $operators.html('').hide();
+            $fixedOperator.val('').hide();
+            $values.html('').hide();
+            $fixedValue.val('').hide();
 
             operators = normalize_operators(operators);
             $.each(operators, function (op_i, op_el) {
@@ -107,9 +107,9 @@
                 $operators.append(op_option);
             });
             if (operators != undefined && operators.length == 1) {
-                $fixedOperator.html(getLabel(operators[0])).removeClass('hide');
+                $fixedOperator.html(getLabel(operators[0])).show();
             } else {
-                $operators.removeClass('hide');
+                $operators.show();
             }
             $operators.trigger('change');
         };
@@ -243,7 +243,7 @@
 
         var getValueElement = function (groupConditions) {
             var element = $(groupConditions).find('.values');
-            if (element.hasClass('hide')) {
+            if (element.is(":hidden")) {
                 element = $(groupConditions).find('.fixed_value');
             }
             return element;
@@ -321,8 +321,10 @@
                 $.each(plugin.parameters.values, function (i, data) {
                     var field = data[0];
                     var groupConditions = plugin.add_condition(field);
-                    var groupConditionId = groupConditions.attr('data-id');
-                    plugin.fill_condition(groupConditionId, data);
+                    if (!is_blank(groupConditions)) {
+                        var groupConditionId = groupConditions.attr('data-id');
+                        plugin.fill_condition(groupConditionId, data);
+                    }
                 });
             }
         };
@@ -334,8 +336,8 @@
             var $fixedValue = $groupConditions.find('.fixed_value');
             var multiple = op_el.attr('data-multiple');
             multiple = (multiple == 'true' ? 'true' : 'false');
-            $values.html('').removeAttr('data-ajax-values').addClass('hide');
-            $fixedValue.removeAttr('data-ajax-values').addClass('hide');
+            $values.html('').removeAttr('data-ajax-values').hide();
+            $fixedValue.removeAttr('data-ajax-values').hide();
 
             if (typeof values === 'string') {
                 $values.attr('data-ajax-values', values);
@@ -360,14 +362,14 @@
                         }
                         $values.append('<option data-index="' + val_i + '" value="' + _id + '">' + _label + '</option>');
                     });
-                    $values.removeClass('hide');
+                    $values.show();
                     $values.trigger('change');
                 } else {
                     if (multiple == 'true') {
-                        $values.removeClass('hide');
+                        $values.show();
                         $values.trigger('change');
                     } else {
-                        $fixedValue.removeClass('hide');
+                        $fixedValue.show();
                         $fixedValue.trigger('change');
                     }
                 }
@@ -391,7 +393,7 @@
             if (!isNaN(multiple)) {
                 for (var i = 1; i < parseInt(multiple); i++) {
                     var $valueElClone = $valueEl.clone();
-                    $valueElClone.addClass('clone').removeClass('hide');
+                    $valueElClone.addClass('clone').show();
                     $valueElClone.insertAfter($valueEl);
                 }
             } else {
@@ -467,7 +469,7 @@
                     console.log(field_name, uTypeField);
                     $el.parent().append('<i class="type_field" style="font-size: 10px; color: #ccc;"><br>' + uTypeField + '</i>');
                 }
-                if (($el.hasClass('values') && !$el.hasClass('hide'))) {
+                if (($el.hasClass('values') && $el.is(":visible"))) {
                     // build_select2_element($el, (!list_with_item && multiple == 'true'));
                     build_select2_element($el);
                 }

data/app/helpers/visual_condition_builder/application_helper.rb

@@ -34,7 +34,7 @@ txtjs
             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
+          concat(content_tag(:div, class: 'dropdown-menu add-condition-menu') do
             create_conditions_fields_item(dictionary_klass.fields(get_dictionary_context(dictionary)))
           end)
         end
@@ -46,10 +46,10 @@ txtjs
       fields.each do |field, attrs|
         if field.is_a?(Hash) #GROUP
           group_label = field.values.first
-          concat(content_tag(:li, group_label, class: 'dropdown-header'))
+          concat(content_tag(:h6, group_label, class: 'dropdown-header'))
           create_conditions_fields_item(attrs)
         else
-          concat(content_tag(:li, link_to(attrs[:label], '#', class: 'add-condition-field', data: {field: field}), class: 'dropdown-item'))
+          concat(link_to(attrs[:label], 'javascript:void(0)', class: 'dropdown-item add-condition-field', data: {field: field}))
         end
       end
     end

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "0.1.6"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Bruno Porto