visual_condition_builder 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 258bcbf53cb35fa5811d80ab924d2a5a08e4196b
-  data.tar.gz: 09385020d82b9437dbb18a3e010242d87eb2b681
+  metadata.gz: c7bd746c4a51174047bd1f502175d0c7ec290d5f
+  data.tar.gz: 085a8891eb6e9463723e88ada7acaee3237785d6
 SHA512:
-  metadata.gz: 983e3adc63c7e4ecb00b2f55191d7b6cb980287f26141765f964bf9f43ff2afd582f3d87f3c08225a5fdb1404c89e4b85034893f8ace6b0dbf228cdb7ea847fd
-  data.tar.gz: d4abea958cd6b65a1414b30754b3dafe33fa670240782cd71e60bba8b6a7e07cd6e074f61015547b47a725e82b8a0dd5c8a8cc4464c193516a51703b8652faed
+  metadata.gz: b1c8e5a9583dbd1b38763be95cf4af04e0bc3bb39cd63c1893893b726d05ca6f24dc633e6b2ff26153f0ba6a4cebb4e753610cf5b1103f4daeaef342c2a54d07
+  data.tar.gz: 3b4fcdbf826ab6844ab500464cf23412f3a93fdf7f1d058734fc19207c928c9d602a2738b21dbe1befcbf10cef243f95d08269d2b01b5b018ecc8a252176e6dd

data/README.md

@@ -260,15 +260,14 @@ end
 #### (view) conditions_fields(name_of_dictionary)
 
 Creates a field selector in a dropdown element (bootstrap).
-Cria um seletor de campos em um elemento dropdown (bootstrap).
-
 ```haml
 = conditions_fields :example
 -# with context:
 = conditions_fields({:dictionary_name => :context_name})
 ```
 
-Mas você pode fazer a geração da lista de campos manualmente através do método `ExampleDictionary.fields(dictionary_name)` *(example_dictionary.rb)*, nesse caso você deve ter elementos "clicáveis" com a classe `add-condition-field` e atributo `data-field: field_name`
+You can create the list item manually `ExampleDictionary.fields (dictionary_name)` *(example_dictionary.rb)*, 
+you must have 'clickable' elements with an `add-condition-field` class and `data-field: field_name` attribute
  ```haml
 %a.add-condition-field{href: '#', data: {field: 'name'}} Name
 %a.add-condition-field{href: '#', data: {field: 'age'}} Age
@@ -287,14 +286,20 @@ How create condition builder in you view:
     -# Conditions Element
     = build_conditions :example, input: '#my_conditions', select2Config: {allowClear: true}
 ```
+Default element id: dictionary_name + context_name + condition_container: `example_default_condition_container`
 
-Por padrão será gerado um elemento com o id no padrão dictionary_name + context_name + condition_container: `example_default_condition_container`
-
-Para criar baseado em um dicionário de contexto específico use:
+To create based on a specific context dictionary use:
 ```haml
 = build_conditions({:dictionary_name => :context_name}, input: '#my_conditions', select2Config: {allowClear: true})
 ```
-Os argumentos possíveis para o build_conditions são:
+
+Its possible change `conditions_fields` title:
+```haml
+= conditions_fields :example, title: 'Click here to select a field'
+```
+
+
+Possible arguments for build_conditions are:
 
 Param | Description
 --- | ---
@@ -305,7 +310,7 @@ debug | to see debugs flags. default: false
 numericConfig | When the field is decimal type then the generator will create an input with numeric mask. Default {aSep: '', aDec: '.', aSign: ''}. See [Auto Numeric Plugin](https://github.com/BobKnothe/autoNumeric#default-settings--supported-options)
 select2Config: | Select2 Configuration. Default {theme: "bootstrap", width: 'auto', placeholder: '', allowClear: false, dropdownAutoWidth: 'true', tags: false, language: "en"}, but some parameters can be overwritten by condition builder. See [Select2 Plugin](https://github.com/select2/select2)
 
-Também é possível criar o builder manualmente chamando o plugin jquery diretamente:
+You can also create the builder manually by calling the jquery plugin:
 ```javascript
 //my_dictionary_json = ExampleDictionary.dictionary(:example).to_json
 //my_initial_values = [['name','eq','My Name']]

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

@@ -10,6 +10,7 @@
             values: [],
             input: '',
             debug: false,
+            show: false,
             numericConfig: {
                 aSep: '',
                 aDec: '.',
@@ -51,6 +52,7 @@
             if (!is_blank(fieldObj.group)) {
                 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>');
@@ -158,7 +160,11 @@
             } else {
                 plugin.parameters.values = values;
             }
-            build_rows();
+            if (plugin.parameters.show==true) {
+                show_rows();
+            } else {
+                build_rows();
+            }
         }; //END load_values
 
         plugin.load_values_from_input = function (element_input) {
@@ -209,6 +215,24 @@
             return f;
         }; //END getFieldByName
 
+        var getOperatorFromField = function (operator_name, field_name_or_operators) {
+            if (jQuery.isArray(field_name_or_operators)) {
+                var operators = field_name_or_operators;
+            } else {
+                var fieldObj = getFieldByName(field_name);
+                var operators = fieldObj.operators;
+            }
+            var f = $.map(operators, function (h, i) {
+                if (h.operator == operator_name) {
+                    return h;
+                }
+            });
+            if (jQuery.isArray(f)) {
+                f = f[0];
+            }
+            return f;
+        }; //END getFieldByName
+
         var getLabel = function (obj) {
             if (!is_blank(obj.label)) {
                 return String(obj.label);
@@ -319,6 +343,24 @@
             plugin.getResult();
         }; //END event_build_expression
 
+        /* UNDER CONSTRUCTION */
+        var show_rows = function () {
+            $element.find('.conditions').html('');
+            if (!is_blank(plugin.parameters.values) && plugin.parameters.values.length > 0) {
+                var $listUl = $('<ul class="list-unstyled"></ul>');
+                $.each(plugin.parameters.values, function (i, data) {
+                    var fieldObj = getFieldByName(data[0]);
+                    var operatorObj = getOperatorFromField(data[1], fieldObj.operators);
+                    var $listItem =  $('<li></li>');
+                    $listItem.append('<span class="pr-2">'+getLabel(fieldObj)+'</span>');
+                    $listItem.append('<span class="pr-2">'+getLabel(operatorObj)+'</span>');
+                    $listItem.append('<span class="">'+data[2]+'</span>');
+                    $listItem.appendTo($listUl);
+                });
+                $element.append($listUl);
+            }
+        };
+
         var build_rows = function () {
             $element.find('.conditions').html('');
             if (!is_blank(plugin.parameters.values) && plugin.parameters.values.length > 0) {

data/app/helpers/visual_condition_builder/application_helper.rb

@@ -16,12 +16,14 @@ module VisualConditionBuilder
       render partial: 'visual_condition_builder/builder_conditions', locals: {container_name: container_name, builder_options: builder_options.to_json.html_safe}
     end
 
-    def conditions_fields(dictionary)
+    def conditions_fields(dictionary, title: nil)
       dictionary_name = get_dictionary_name(dictionary)
       dictionary_klass = get_dictionary_klass(dictionary)
-      @container_name = "##{dictionary_name}_condition_container"
-      @fields = dictionary_klass.fields(get_dictionary_context(dictionary))
-      render partial: 'visual_condition_builder/conditions_fields'
+      container_id = "##{dictionary_name}_condition_container"
+      fields = dictionary_klass.fields(get_dictionary_context(dictionary))
+      title = I18n.t(:dropdown, default: ['Fields'], scope: [:condition_builder]) if title.blank?
+      render partial: 'visual_condition_builder/conditions_fields',
+             locals: {container_id: container_id, fields: fields, title: title}
     end
 
     private

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

@@ -1,6 +1,6 @@
-<div class="dropdown add-condition" data-target="<%= @container_name %>">
+<div class="dropdown add-condition" data-target="<%= container_id %>">
   <button class="btn btn-default dropdown-toggle" data-toggle="dropdown", data-type="button">
-    <%= I18n.t(:dropdown, default: ['Fields'], scope: [:condition_builder]) %>
+    <%= title %>
     <span class="caret"></span>
   </button>
   <ul class="dropdown-menu dropdown-menu-scrollable add-condition-menu">
@@ -8,6 +8,6 @@
       <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} %>
+    <%= render partial: 'visual_condition_builder/conditions_fields_item', locals: {fields: fields} %>
   </ul>
 </div>

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Bruno Porto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails