Merge pull request wikirate#1643 from wikirate/staging

ISIN in exports, better hover in answers/filters, etc

mod/deckorate_calculations/assets/style/tree.scss

@@ -13,7 +13,7 @@
 
 $tree-button-padding: .3rem !default;
 $tree-body-padding: 0.5rem 0rem 0.5rem 2rem !default
-$tree-button-active-bg: $gray-100 !default;
+$tree-button-active-bg: $bar-body-hover-color !default;
 $tree-border-color: $gray-200 !default;
 
 .tree-button {
@@ -33,8 +33,9 @@ $tree-border-color: $gray-200 !default;
 
   &:not(.collapsed) {
     color: $accordion-button-active-color;
-    background-color: $tree-button-active-bg;
-    box-shadow: inset 0 ($accordion-border-width * -1) 0 $tree-border-color;
+    // background-color: $tree-button-active-bg;
+    // border: 1px solid $tree-border-color;
+    // box-shadow: inset 0 ($accordion-border-width * -1) 0 $tree-border-color;
 
     &::before {
       background-image: escape-svg($accordion-button-active-icon);
@@ -60,6 +61,7 @@ $tree-border-color: $gray-200 !default;
 
   &:hover {
     z-index: 2;
+    background-color: $bar-body-hover-color;
   }
 
   &:focus {

mod/deckorate_core/assets/style/answers.scss

@@ -47,9 +47,6 @@
     > div {
       margin-left: 1rem;
     }
-    &:not(.collapsed) {
-      background-color: inherit;
-    }
   }
   .tree-body {
     padding: 0 0 0 2.5rem

mod/deckorate_core/lib/answer/export.rb

@@ -11,15 +11,15 @@ module ClassMethods
       def csv_titles detailed=false
         basic = ["Answer Page", "Metric", "Company", "Year", "Value", "Source Page"]
         with_detailed basic, detailed do
-          ["Answer ID", "Original Source", "Source Count", "Comments"]
+          ["Answer ID", "Original Source", "Source Count", "Comments", "ISIN"]
         end
       end
     end
 
     def csv_line detailed=false
       basic = [answer_link, metric_name, company_name, year, value, source_page_url]
       with_detailed basic, detailed do
-        [answer_id, source_url, source_count, comments]
+        [answer_id, source_url, source_count, comments, isin]
       end
     end
 
@@ -63,5 +63,9 @@ def company_name
     def record_name
       "#{metric_name}+#{company_name}"
     end
+
+    def isin
+      company_id&.card&.isin_card&.item_names&.join ";"
+    end
   end
 end

mod/deckorate_core/set/abstract/answer_search/filtered_results/grouped_company.haml

@@ -1,4 +1,4 @@
-.bar.w-100.d-flex
+.bar.no-bar-hover.w-100.d-flex
   .answer-group.grouped-company-list.row.w-100.bar-body
     .col-8.bar-left
       = nest company_id.card, view: :thumbnail

mod/deckorate_core/set/abstract/answer_search/filtered_results/grouped_metric.haml

@@ -1,5 +1,4 @@
-
-.bar.w-100.d-flex
+.bar.no-bar-hover.w-100.d-flex
   .answer-group.grouped-metric-list.row.w-100.bar-body
     .col-8.bar-left
       = nest metric_id.card, view: :thumbnail

mod/deckorate_core/set/abstract/answer_search/filtered_results/grouped_record.haml

@@ -3,7 +3,7 @@
   = nest_item latest_answer, view: :full_bar
 - else
   - class_up "bar", "with-bar-menu" if voo.show? :bar_menu
-  .answer-group.grouped-record-list.w-100.nodblclick.d-flex._card-link{ class: classy("bar"), data: latest_answer.format.bar_wrap_data }
+  .answer-group.grouped-record-list.no-bar-hover.w-100.nodblclick.d-flex._card-link{ class: classy("bar"), data: latest_answer.format.bar_wrap_data }
     .row.g-0.bar-body
       .bar-left.col-8
         = nest_item latest_answer, view: :bar_left

mod/wikirate/assets/style/colors.scss

@@ -423,3 +423,14 @@ $lightMap: (
 .light-grey-color-2 {
   color: $gray-500;
 }
+
+// TODO move variables at top to variables file and change
+// $accordion-button-active-bg to $light-purple
+// and get rid of this
+.filter-form {
+  .accordion-button {
+    &:not(.collapsed) {
+      background-color: $light-purple;
+    }
+  }
+}