From 7ef7e2397f4b4e3613ccaa74449cb8c2099cbf78 Mon Sep 17 00:00:00 2001
From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
Date: Tue, 9 Apr 2019 14:18:22 +0200
Subject: [PATCH] Change activity filter order and reduce custom date label
 size [SCI-3301] (#1651)

* Change activity filter order and reduce custom date label size

* Fix hound
---
 app/assets/stylesheets/global_activities.scss    |  4 ++++
 .../global_activities/_side_filters.html.erb     |  2 +-
 .../my_modules/activities/_side_filters.html.erb |  2 +-
 config/initializers/extends.rb                   | 16 ++++++++--------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss
index 11590883d..816e89353 100644
--- a/app/assets/stylesheets/global_activities.scss
+++ b/app/assets/stylesheets/global_activities.scss
@@ -117,6 +117,10 @@
       line-height: 20px;
       margin-bottom: 5px;
       width: calc(100% - 50px);
+
+      &.sub {
+        font-size: 12px;
+      }
     }
 
     .clear {
diff --git a/app/views/global_activities/_side_filters.html.erb b/app/views/global_activities/_side_filters.html.erb
index 27033e8ab..23cec67ae 100644
--- a/app/views/global_activities/_side_filters.html.erb
+++ b/app/views/global_activities/_side_filters.html.erb
@@ -27,7 +27,7 @@
       <div class="hot-button btn btn-default" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
       <div class="hot-button btn btn-default" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
     </div>
-    <h4 class="title">
+    <h4 class="title sub">
       <%= t('global_activities.index.custom_dates_label') %>
     </h4>
     <div class="to">
diff --git a/app/views/my_modules/activities/_side_filters.html.erb b/app/views/my_modules/activities/_side_filters.html.erb
index 21f15d51e..c3844e11f 100644
--- a/app/views/my_modules/activities/_side_filters.html.erb
+++ b/app/views/my_modules/activities/_side_filters.html.erb
@@ -14,7 +14,7 @@
       <div class="hot-button btn btn-default" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
       <div class="hot-button btn btn-default" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
     </div>
-    <h4 class="title">
+    <h4 class="title sub">
       <%= t('global_activities.index.custom_dates_label') %>
     </h4>
     <div class="to">
diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index 3e1dd9616..1555a45c5 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -212,15 +212,15 @@ class Extends
   }
 
   ACTIVITY_GROUPS = {
-    projects: [*0..7, 32, 33, 34],
-    task_results: [*23..26, 40, 41, 42, 99],
-    task: [*8..14, 35, 36, 37, 53, 54, *58..69, 106],
-    task_protocol: [*15..22, 45, 46, 47, 38, 39, 100],
+    projects: [*0..7, 32, 33, 34, 95],
+    task_results: [23, 26, 25, 42, 24, 40, 41, 99],
+    task: [8, 58, 9, 59, 10, 11, 12, 13, 14, 35, 36, 37, 53, 54, *60..69, 106],
+    task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 45, 46, 47],
     task_inventory: [55, 56],
     experiment: [*27..31, 57],
-    reports: [48, 49, 50],
-    inventories: [*70..78, 105, 102],
-    protocol_repository: [*79..91, 101, 103],
-    team: [*92..97, 104]
+    reports: [48, 50, 49],
+    inventories: [70, 71, 105, 72, 73, 74, 102, 75, 76, 77, 78, 96],
+    protocol_repository: [80, 103, 89, 87, 79, 90, 91, 88, 85, 86, 84, 81, 82, 83, 101],
+    team: [92, 94, 93, 97, 104]
   }.freeze
 end