discerner 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26ea81aeac59525239c0078e08c14647c1900dd6
-  data.tar.gz: 9b84a30a0b9f8fc95e61bacb664f841246817c2f
+  metadata.gz: 49628dbdcf63e05933a54b84e4d6f0162c322f78
+  data.tar.gz: ca6cc17e8d4f66c9484508e195d7f6ddead236d3
 SHA512:
-  metadata.gz: 469b864ff203219f141ad24a874f0f731ab3d9d449a5fe5f38b4f56ef7cc7bf3face4088e162eff306e9b4b816ea82fc6cc6abcaf2aee385ff44d95bc2058037
-  data.tar.gz: ce3e880a330bddd8616b67d0fd14a6c930d89b0671b9e4576ba4000d1e09a5c543bc0304a8a6aeb3e91ba2d5ecbaedb38b15a23c0731972e474a3e7876561510
+  metadata.gz: 6f8194a039eba254752279fe88b6aa848c7cd8085f88df29358b4ea6d5d9a9885825188560fa5af22829197826b404233707dfe90430af1022e6edd26af44bc0
+  data.tar.gz: e7306ba0e1dcc68816bf0b516440e20d8e843209c05f7182a8b9f8686e8c1e2a53609210bafe17077e7e22e74fa0c52de2227c4d5ea5b193d7794d79f3d28464

data/app/assets/javascripts/discerner/search_parameter.js

@@ -22,26 +22,26 @@ Discerner.SearchParameter.UI = function (config) {
         }
       });
       $.each($('select.parameters_combobox_autocompleter option'), function(){
-        if (!($(this).hasClass(dictionary_class) || $(this).val() == '')) {
+        if (!($(this).hasClass(dictionary_class) || $(this).val() === '')) {
           $(this).remove();
         }
       });
-    };
+    }
     $(".parameters_combobox_autocompleter").combobox({watermark:'a criteria'});
 
     // get max display order
     $.each(display_orders, function(){
-      var val = parseInt($(this).val());
-      if (val >= i) { i = val }
+      var val = parseInt($(this).val(), 10);
+      if (val >= i) { i = val; }
     });
 
     // assign display order to search predicates without it
     $.each(display_orders, function(){
-      if ($(this).val().length == 0) {
-        i = i + 1
+      if ($(this).val().length === 0) {
+        i = i + 1;
         $(this).val(i);
       }
-    })
+    });
   },
   searchParametersNestedAttributesForm = new NestedAttributes({
     container: $('.search_parameters'),
@@ -57,7 +57,7 @@ Discerner.SearchParameter.UI = function (config) {
         select = $(this).siblings('select').first(),
         // get all the "sibling" dropdowns
         sibling_selects = $('select.' + select.attr('class')).filter(function(){
-          return $(this).closest('tr').find('td.remove input[name$="[_destroy]"]:not([name*="[search_parameter_values_attributes]"])').filter(function() { return this.value === '1'; }).length == 0 // exclude rows marked for destroy
+          return $(this).closest('tr').find('td.remove input[name$="[_destroy]"]:not([name*="[search_parameter_values_attributes]"])').filter(function() { return this.value === '1'; }).length === 0; // exclude rows marked for destroy
         }),
         // get all selected parameter options from sibling selects
         matching_selected_options = sibling_selects.find('option.exclusive:selected');
@@ -67,7 +67,7 @@ Discerner.SearchParameter.UI = function (config) {
     $.each(matching_selected_options, function(){
       option = select.find('option[value=' + $(this).val() + ']');
       popup.find('.parameter_category .criteria a.categorized_autocompleter_item_link[rel="' + $(option).attr('id') + '"]').addClass('selection_disabled');
-    })
+    });
     toggleCategorizedAutocompleterPopup(this);
     toggleCategorizedAutocompleterPopup($(this).closest('.search_parameter').find('.parameter_value a.expanded_categorized_autocompleter_link'));
   });
@@ -105,10 +105,9 @@ Discerner.SearchParameter.UI = function (config) {
       add_button = $(predicate).find('a.add_search_parameter_values');
 
     $(predicate).find('.nested_records_search_parameter_values .search_parameter_value .delete_search_parameter_values').click();
-    if ($(selected_option).length == 0 || $(selected_option).val() == ''){
+    if ($(selected_option).length === 0 || $(selected_option).val() === ''){
       $(add_button).hide();
-    }
-    else if ($(selected_option).hasClass('list')){
+    } else if ($(selected_option).hasClass('list')) {
       $($(predicate).find('.tmp_link')).remove();
       $.get(parametersUrl.sub({ question_id: this.value }), function (data) {
         $.each(data.parameter_values, function() {
@@ -119,12 +118,29 @@ Discerner.SearchParameter.UI = function (config) {
           $(add_button).hide();
         });
      });
+    } else if ($(selected_option).hasClass('exclusive_list')) {
+      $($(predicate).find('.tmp_link')).remove();
+      $.get(parametersUrl.sub({ question_id: this.value }), function (data) {
+        $(add_button).click();
+        var row = $(predicate).find('.nested_records_search_parameter_values .search_parameter_value .parameter_value').filter(':last');
+        $.each(data.parameter_values, function() {
+          var value_id_element = row.find('.parameter_value_id'),
+              radio_id = value_id_element.attr('id') + '_' + this.parameter_value_id,
+              value_item_div = $('<div>').addClass('parameter_value_item');
+
+          radio_button      = $('<input>').attr('type', 'radio').attr('name', value_id_element.attr('name')).attr('id',radio_id).val(this.parameter_value_id);
+          radio_button_text = $('<label>').attr('for', radio_id).text(this.name);
+          value_item_div.append(radio_button);
+          value_item_div.append(radio_button_text);
+          row.append(value_item_div);
+          $(add_button).hide();
+        });
+      });
     } else {
       $(add_button).show();
       $(add_button).click();
     }
   });
-
   setupParameters();
 };
 

data/app/assets/javascripts/discerner/search_parameter_value.js

@@ -33,7 +33,7 @@ Discerner.SearchParameterValue.UI = function (config) {
       hideValue($(row).find('.additional_value').show());
       row.find('.parameter_values_boolean_operator').show();
 
-      if ($(selectedParameter).hasClass('list')) {                                     // list parameters
+      if ($(selectedParameter).hasClass('list')){                                      // list parameters
         row.find('.chosen, .parameter_value').show();
         $(config.container).find('a.add_search_parameter_values').hide();
         $(config.container).find('.additional_value').hide();
@@ -57,6 +57,10 @@ Discerner.SearchParameterValue.UI = function (config) {
           }
         $(config.container).find('.parameter_value, .remove').show();
         $(config.container).find('a.add_search_parameter_values').show();
+      } else if ($(selectedParameter).hasClass('exclusive_list')) {                   // exclusive parameter values list
+        $(config.container).find('a.add_search_parameter_values').hide();
+        $(config.container).find('.additional_value', '.chosen').hide();
+        $(config.container).find('.parameter_value').show();
       } else {                                                                        // date, text and numeric parameters
         var parameter_classes = ['date', 'numeric', 'text', 'string'];
         for (var i in parameter_classes) {
@@ -164,7 +168,7 @@ Discerner.SearchParameterValue.UI = function (config) {
     $(this).closest('.categorized-parameter-values, .uncategorized-parameter-values').find('.category-items').show();
     $(this).addClass('hide-category-items');
     $(this).removeClass('show-category-items');
-    $(this).html('less')
+    $(this).html('less');
   });
 
   $(document).on('click', '.hide-category-items', function(e) {
@@ -172,6 +176,6 @@ Discerner.SearchParameterValue.UI = function (config) {
     $(this).closest('.categorized-parameter-values, .uncategorized-parameter-values').find('.category-items').hide();
     $(this).addClass('show-category-items');
     $(this).removeClass('hide-category-items');
-    $(this).html('more')
+    $(this).html('more');
   });
 };

data/app/assets/stylesheets/discerner/searches.sass

@@ -137,6 +137,9 @@
         :width 28em
       .column
         :width 12em
+      input[type="radio"]
+        :margin 0.3em 0.7em 0.3em 0.5em
+
 
     .parameter, .combined_search, .parameter_value
       .categorized_autocompleter, .combined_search_combobox

data/app/views/discerner/searches/_search_parameter_value_fields.html.haml

@@ -47,6 +47,14 @@
       %td.remove
         = discerner_link_to_remove_fields 'Remove', f, :search_parameter_values
 
+    - when 'exclusive_list'
+      %td.parameter_value
+        - parameter.parameter_values.each do |parameter_value|
+          .parameter_value_item
+            = f.radio_button :parameter_value_id, parameter_value.id, class: 'parameter_value_id'
+            = f.label :parameter_value_id, parameter_value.name
+      %td{class: "remove", class: "invisible"}
+        = discerner_link_to_remove_fields 'Remove', f, :search_parameter_values
     - else
       %td.operator
         - selected = f.object.operator.blank? ? nil : f.object.operator.id

data/lib/discerner/enum.rb

@@ -0,0 +1,29 @@
+module Discerner
+  module Enum
+    DISCERNER_PARAMETER_TYPE_NUMERIC = 'numeric'
+    DISCERNER_PARAMETER_TYPE_DATE = 'numeric'
+    DISCERNER_PARAMETER_TYPES = ['numeric', 'date', 'list', 'combobox', 'text', 'string', 'search', 'exclusive_list'].freeze
+
+    ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE = 'not applicable'
+    ABSTRACTION_OTHER_VALUE_TYPES = [ABSTRACTION_OTHER_VALUE_TYPE_UNKNOWN, ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE]
+
+    ABSTRACTION_STATUS_NEEDS_REVIEW = 'needs review'
+    ABSTRACTION_STATUS_REVIEWED = 'reviewed'
+    ABSTRACTION_STATUS_ACTUALLY_ANSWERED = 'actually answered'
+    ABSTRACTION_STATUSES = [ABSTRACTION_STATUS_NEEDS_REVIEW, ABSTRACTION_STATUS_REVIEWED, ABSTRACTION_STATUS_ACTUALLY_ANSWERED]
+
+    ABSTRACTION_SUGGESTION_TYPE_UNKNOWN = 'unknown'
+    ABSTRACTION_SUGGESTION_TYPE_SUGGESTED = 'suggested'
+    ABSTRACTION_SUGGESTION_TYPES = [ABSTRACTION_SUGGESTION_TYPE_UNKNOWN, ABSTRACTION_SUGGESTION_TYPE_SUGGESTED]
+
+    ABSTRACTOR_SECTION_TYPE_CUSTOM = 'custom'
+    ABSTRACTOR_SECTION_TYPE_NAME_VALUE = 'name/value'
+    ABSTRACTOR_SECTION_TYPES = [ABSTRACTOR_SECTION_TYPE_CUSTOM, ABSTRACTOR_SECTION_TYPE_NAME_VALUE]
+
+    ABSTRACTOR_SUGGESTION_STATUS_NEEDS_REVIEW = 'Needs review'
+    ABSTRACTOR_SUGGESTION_STATUS_ACCEPTED = 'Accepted'
+    ABSTRACTOR_SUGGESTION_STATUS_REJECTED = 'Rejected'
+    ABSTRACTOR_SUGGESTION_STATUSES = [ABSTRACTOR_SUGGESTION_STATUS_NEEDS_REVIEW, ABSTRACTOR_SUGGESTION_STATUS_ACCEPTED, ABSTRACTOR_SUGGESTION_STATUS_REJECTED]
+    ABSTRACTOR_GROUP_SENTINENTAL_SUBTYPE = 'sentinental'
+  end
+end

data/lib/discerner/methods/helpers/searches_helper.rb

@@ -90,7 +90,7 @@ module Discerner
             parameter_categories_used      = search.export_parameters.map{ |ep| ep.parameter.parameter_category }.flatten
             parameter_categories           = parameter_categories_available | parameter_categories_used
           end
-          parameter_categories.sort{|a,b| a.parameters.length <=> b.parameters.length}
+          parameter_categories
         end
 
         def exportable_parameters(search, category)

data/lib/discerner/methods/models/parameter_type.rb

@@ -21,7 +21,7 @@ module Discerner
 
         def name_supported?
           return if self.name.blank?
-          supported_types = ['numeric', 'date', 'list', 'combobox', 'text', 'string', 'search']
+          supported_types = ['numeric', 'date', 'list', 'combobox', 'text', 'string', 'search', 'exclusive_list']
           errors.add(:base,"Parameter type '#{self.name}' is not supported, please use one of the following types: #{supported_types.join(', ')}") unless supported_types.include?(self.name)
         end
       end

data/lib/discerner/methods/models/search_parameter.rb

@@ -52,6 +52,9 @@ module Discerner
           when 'combobox'
             values    = [search_parameter_values.map { |spv| spv.parameter_value.search_value unless spv.parameter_value.nil? }.compact]
             predicate = "#{parameter.search_method} in (?)" unless values.blank?
+          when 'exclusive_list'
+            values    = [search_parameter_values.map { |spv| spv.parameter_value.search_value unless spv.parameter_value.nil? }.compact.first]
+            predicate = "#{parameter.search_method} = ?" unless values.blank?
           else # 'numeric','date', 'text', 'string
             spvs = []
             values = []

data/lib/discerner/methods/models/search_parameter_value.rb

@@ -75,7 +75,7 @@ module Discerner
             warnings.add(:base, "Provided date is not valid")
             return true
           end
-          if parameter_value.blank? && search_parameter.parameter.parameter_type.name == 'combobox'
+          if parameter_value.blank? && ['combobox', 'exclusive_list'].include?(search_parameter.parameter.parameter_type.name)
             warnings.add(:base, "Parameter value has to be selected")
             return true
           end
@@ -116,7 +116,7 @@ module Discerner
           end
 
           def validate_operator
-            if search_parameter && search_parameter.parameter && search_parameter.parameter.parameter_type && ['list', 'combobox'].include?(search_parameter.parameter.parameter_type.name)
+            if search_parameter && search_parameter.parameter && search_parameter.parameter.parameter_type && ['list', 'combobox', 'exclusive_list'].include?(search_parameter.parameter.parameter_type.name)
               self.operator = nil
             else
               errors.add(:base, "Operator has to be selected for parameter values that do not belong to list or combobox") if operator.blank?

data/lib/discerner/version.rb

@@ -1,3 +1,3 @@
 module Discerner
-  VERSION = "2.0.14"
+  VERSION = "2.0.15"
 end

data/lib/generators/discerner/install/templates/dictionaries.yml

@@ -1,36 +1,36 @@
 # ---- General structure:
 #   :dictionaries:
-#    - :name: string                                                            # has to be unique within not-deleted dictionaries
+#    - :name: string                                                                    # has to be unique within not-deleted dictionaries
 #      :parameter_categories:
-#       - :name: string                                                         # has to be unique within the dictionary
+#       - :name: string                                                                 # has to be unique within the dictionary
 #         :parameters:
-#           - :name: string                                                     # used for display
-#             :unique_identifier:                                               # has to be unique within the dictionary
+#           - :name: string                                                             # used for display
+#             :unique_identifier:                                                       # has to be unique within the dictionary
 #             :export:
-#               :model: string                                                  # name of the model to be used for exporting
-#               :method: string                                                 # name of the model method to be used for exporting
-#               :hidden: boolean                                                # default: false. If set to true, parameter will be hidden from list of exportable parameters
-#             :search:                                                          # parameter search model and method combination has to be unique within the category
-#               :model: string                                                  # name of the model to be used for searching
-#               :method: string                                                 # name of the model method to be used for searching
-#               :hidden: boolean                                                # default: false. If set to true, parameter will be hidden from list of searchable parameters
-#               :parameter_type: numeric/date/list/combobox/text/string         # used to define applicable operators/display options. does not have to be restricted to the given list, but additional parameters will require adding operators to match
-#               :parameter_value_categories_source:                             # used to define parameter value categories
-#                 :model: string                                                # source model to be used to load parameter value categiories
-#                 :method: string                                               # method in the source model that returns parameter_value_categories in a form of [{name: 'string, unique_identifier: 'adventure', display_order: 1, collapse: true}]
-#               :parameter_value_categories:                                    # used to define parameter value categories
+#               :model: string                                                          # name of the model to be used for exporting
+#               :method: string                                                         # name of the model method to be used for exporting
+#               :hidden: boolean                                                        # default: false. If set to true, parameter will be hidden from list of exportable parameters
+#             :search:                                                                  # parameter search model and method combination has to be unique within the category
+#               :model: string                                                          # name of the model to be used for searching
+#               :method: string                                                         # name of the model method to be used for searching
+#               :hidden: boolean                                                        # default: false. If set to true, parameter will be hidden from list of searchable parameters
+#               :parameter_type: numeric/date/list/combobox/text/string/exclusive_list  # used to define applicable operators/display options. does not have to be restricted to the given list, but additional parameters will require adding operators to match
+#               :parameter_value_categories_source:                                     # used to define parameter value categories
+#                 :model: string                                                        # source model to be used to load parameter value categiories
+#                 :method: string                                                       # method in the source model that returns parameter_value_categories in a form of [{name: 'string, unique_identifier: 'adventure', display_order: 1, collapse: true}]
+#               :parameter_value_categories:                                            # used to define parameter value categories
 #                 - :name: string
-#                   :unique_identifier: string                                  # has to be unique within parameter
-#                   :collapse: boolean                                          # used to define if parameter category should be collapsed in the list and its values hidden from the view
+#                   :unique_identifier: string                                          # has to be unique within parameter
+#                   :collapse: boolean                                                  # used to define if parameter category should be collapsed in the list and its values hidden from the view
 #                   :display_order: integer
-#               :allow_empty_values: boolean                                    # default: true. If set to true, "none" value will be added to the list ov values
-#               :parameter_values:                                              # needs to be defined for list/combobox parameters unless parameter values come from the model, see ':source'
-#                 - :name: string                                               # used for display, if not provided, 'search_value' will be used instead
-#                   :search_value: string                                       # has to be unique within parameter, intendend to be used as a database value while searching
-#                   :parameter_value_category: string                           # used to define category for parameter value, should match one of parameter_value_categories unique_identifiers listed above
+#               :allow_empty_values: boolean                                            # default: true. If set to true, "none" value will be added to the list ov values
+#               :parameter_values:                                                      # needs to be defined for list/combobox parameters unless parameter values come from the model, see ':source'
+#                 - :name: string                                                       # used for display, if not provided, 'search_value' will be used instead
+#                   :search_value: string                                               # has to be unique within parameter, intendend to be used as a database value while searching
+#                   :parameter_value_category: string                                   # used to define category for parameter value, should match one of parameter_value_categories unique_identifiers listed above
 #               :source:
-#                 :model: string                                                # source model to be used to load parameter values
-#                 :method: string                                               # method/method in the source model to be used to load parameter values
+#                 :model: string                                                        # source model to be used to load parameter values
+#                 :method: string                                                       # method/method in the source model to be used to load parameter values
 
 ---
 :dictionaries:
@@ -270,3 +270,13 @@
               :method: text
               :hidden: true
 
+          - :name: "Bestseller"
+            :unique_identifier: bestseller
+            :search:
+              :model: Book
+              :method: text
+              :parameter_type: exclusive_list
+              :parameter_values:
+                - :search_value: yes
+                - :search_value: no
+

data/lib/setup/operators.yml

@@ -8,6 +8,7 @@
       - numeric
       - date
       - string
+      - exclusive_list
   - :unique_identifier: is_not_equal_to
     :type: comparison
     :symbol: '!='
@@ -16,6 +17,7 @@
       - numeric
       - date
       - string
+      - exclusive_list
   - :unique_identifier: is_less_than
     :type: comparison
     :symbol: '<'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discerner
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -436,6 +436,7 @@ files:
 - db/seeds.rb
 - lib/discerner.rb
 - lib/discerner/engine.rb
+- lib/discerner/enum.rb
 - lib/discerner/methods/controllers/export_parameters_controller.rb
 - lib/discerner/methods/controllers/parameters_controller.rb
 - lib/discerner/methods/controllers/searches_controller.rb