card 1.93.6 → 1.93.7

data/mod/search/template/abstract/03_filter/filter_form.haml

@@ -15,27 +15,29 @@
         %input{ type: :hidden, name: "filter[not_ids]", class: "_not-ids", value: not_ids }
         .d-flex.flex-row
           - if sort_input_field
-            %i.material-icons.text-muted.md-24.p-2 sort
-            .input-group.sort-input-group.mb-2.card-outline-primary.mr-2
-              %span.input-group-addon sort
-              = sort_input_field
+            .sort-in-filter-form
+              %i.material-icons.text-muted.md-24.p-2.float-left sort
+              .input-group.sort-input-group.mb-2.card-outline-primary.mr-5
+                %span.input-group-addon sort
+                = sort_input_field
 
-          %i.material-icons.text-muted.md-24.p-2 search
-          ._filter-container.d-flex.flew-row.flex-wrap
-            - categories.each do |key, category|
-              - if category[:active]
-                = haml_partial :filter_input, key: key, category: category
+          .filter-in-filter-form
+            %i.material-icons.text-muted.md-24.p-2.float-left search
+            ._filter-container.d-flex.flew-row.flex-wrap
+              - categories.each do |key, category|
+                - if category[:active]
+                  = haml_partial :filter_input, key: key, category: category
 
-            .dropdown._add-filter-dropdown
-              %button.btn.btn-secondary.dropdown-toggle{"aria-expanded": "false",
-                                                        "aria-haspopup": "true",
-                                                        "data-toggle": "dropdown",
-                                                        type: "button" }
-                Add filter
-              .dropdown-menu
-                - categories.each do |key, category|
-                  %a.dropdown-item._filter-category-select{style: ("display: none;" if category[:active]),
-                                                           "data-category" => key,
-                                                           "data-label" => category[:label],
-                                                           :href => "#"}
-                    = category[:label]
+              .dropdown._add-filter-dropdown
+                %button.btn.btn-secondary.dropdown-toggle{"aria-expanded": "false",
+                                                          "aria-haspopup": "true",
+                                                          "data-toggle": "dropdown",
+                                                          type: "button" }
+                  Add filter
+                .dropdown-menu
+                  - categories.each do |key, category|
+                    %a.dropdown-item._filter-category-select{style: ("display: none;" if category[:active]),
+                                                             "data-category" => key,
+                                                             "data-label" => category[:label],
+                                                             :href => "#"}
+                      = category[:label]

data/mod/search/template/abstract/search/checkbox_item.haml

@@ -2,6 +2,6 @@
 %table.search-checkbox-item._search-checkbox-item.w-100
   %tr
     %td.checkbox-side
-      = check_box_tag "checkbox-#{unique_id}", item_card.key
+      = check_box_tag item_card.name, item_card.key
     %td.item-view-side{ style: "background: #fff" }
       = nest_item item_card

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.93.6
+  version: 1.93.7
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -479,6 +479,7 @@ files:
 - lib/card/mailer.rb
 - lib/card/migration.rb
 - lib/card/migration/core.rb
+- lib/card/migration/deck_structure.rb
 - lib/card/migration/import.rb
 - lib/card/migration/import/import_data.rb
 - lib/card/migration/import/import_data/card_attributes.rb
@@ -551,6 +552,8 @@ files:
 - lib/card/view/cache.rb
 - lib/card/view/cache_action.rb
 - lib/card/view/options.rb
+- lib/card/view/options/key_lists.rb
+- lib/card/view/options/voo_api.rb
 - lib/card/view/stub.rb
 - lib/card/view/visibility.rb
 - lib/cardio.rb
@@ -3263,6 +3266,7 @@ files:
 - mod/bootstrap/vendor/select2/tests/vendor/qunit-1.23.1.js
 - mod/bootstrap/vendor/select2/vendor/jquery-2.1.0.js
 - mod/carrierwave/Gemfile
+- mod/carrierwave/config/core_initializers/carrierwave.rb
 - mod/carrierwave/lib/carrier_wave/cardmount.rb
 - mod/carrierwave/lib/carrier_wave/file_card_uploader.rb
 - mod/carrierwave/lib/carrier_wave/image_card_uploader.rb
@@ -3522,8 +3526,7 @@ files:
 - mod/search/lib/card/filter_query.rb
 - mod/search/set/abstract/00_filter_helper.rb
 - mod/search/set/abstract/01_filter_form_helper.rb
-- mod/search/set/abstract/01_search_params.rb
-- mod/search/set/abstract/02_filter_formgroups.rb
+- mod/search/set/abstract/02_search_params.rb
 - mod/search/set/abstract/03_filter.rb
 - mod/search/set/abstract/04_right_filter_form.rb
 - mod/search/set/abstract/search.rb

data/mod/search/set/abstract/02_filter_formgroups.rb

@@ -1,134 +0,0 @@
-include_set Abstract::FilterFormHelper
-
-# FIXME: the vast majority of these need to be moved back to wikirate
-format :html do
-  view :filter_name_formgroup, cache: :never do
-    text_filter :name
-  end
-
-  view :filter_project_formgroup, cache: :never do
-    select_filter_type_based :project
-  end
-
-  view :filter_year_formgroup, cache: :never do
-    select_filter :year, "Year", "most recent"
-  end
-
-  view :filter_wikirate_topic_formgroup, cache: :never do
-    # select_filter_type_based :wikirate_topic
-    autocomplete_filter :wikirate_topic
-  end
-
-  view :filter_metric_formgroup, cache: :never do
-    # select_filter_type_based :metric
-    autocomplete_filter :metric
-  end
-
-  view :filter_wikirate_company_formgroup, cache: :never do
-    # select_filter_type_based :wikirate_company
-    autocomplete_filter :wikirate_company
-  end
-
-  view :filter_research_policy_formgroup, cache: :never do
-    multiselect_filter :research_policy, "Research Policy"
-  end
-
-  def research_policy_select
-    select_filter_type_based :research_policy
-  end
-
-  view :filter_metric_type_formgroup, cache: :never do
-    multiselect_filter :metric_type, "Metric Type"
-  end
-
-  def metric_type_select
-    select_filter :metric_type, "Metric Type"
-  end
-
-  view :filter_metric_value_formgroup, cache: :never do
-    select_filter :metric_value, "Value", "exists"
-  end
-
-  view :filter_designer_formgroup, cache: :never do
-    select_filter :designer, "Designer"
-  end
-
-  view :filter_importance_formgroup, cache: :never do
-    multiselect_filter :importance, "My Vote", %w[upvotes novotes]
-  end
-
-  view :filter_industry_formgroup, cache: :never do
-    select_filter :industry, "Industry"
-  end
-
-  def sort_options
-    {}
-  end
-
-  def default_year_option
-    { "Most Recent" => "latest" }
-  end
-
-  def year_options
-    type_options(:year, "desc").each_with_object(default_year_option) do |v, h|
-      h[v] = v
-    end
-  end
-
-  def metric_value_options
-    opts = {
-      "All" => "all",
-      "Researched" => "exists",
-      "Known" => "known",
-      "Unknown" => "unknown",
-      "Not Researched" => "none",
-      "Edited today" => "today",
-      "Edited this week" => "week",
-      "Edited this month" => "month",
-      "Outliers" => "outliers"
-    }
-    return opts unless filter_param(:range)
-    opts.each_with_object({}) do |(k, v), h|
-      h[add_range(k, v)] = v
-    end
-  end
-
-  def add_range key, _value
-    key # unless selected_value?(value)
-    # range = filter_param :range
-    # "#{range[:from]} <= #{key} < #{range[:to]}"
-  end
-
-  def selected_value? value
-    (filter_param(:metric_value) && value == filter_param(:metric_value)) ||
-      value == "exists"
-  end
-
-  def metric_type_options
-    %i[researched formula wiki_rating].map { |n| Card.quick_fetch(n).name }
-  end
-
-  def research_policy_options
-    type_options :research_policy
-  end
-
-  def importance_options
-    { "I voted FOR" => :upvotes,
-      "I voted AGAINST" => :downvotes,
-      "I did NOT vote" => :novotes }
-  end
-
-  def industry_options
-    card_name = CompanyFilterQuery::INDUSTRY_METRIC_NAME
-    Card[card_name].value_options
-  end
-
-  def designer_options
-    metrics = Card.search type_id: MetricID, return: :name
-    metrics.map do |m|
-      names = m.to_name.parts
-      # score metric?
-      names.length == 3 ? names[2] : names[0]
-    end.uniq!(&:downcase).sort_by!(&:downcase)
-  end
-end