From 023a6fe0a8b3f20fcd9eeb6f748deb5494b5562b Mon Sep 17 00:00:00 2001
From: Ivan Kljun <ivan@scinote.net>
Date: Thu, 24 Aug 2023 08:31:07 +0200
Subject: [PATCH 1/3] Update 'Not started' button for reports [SCI-9007]

---
 app/services/reports/docx/draw_my_module.rb            | 2 +-
 app/views/reports/elements/_my_module_element.html.erb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/services/reports/docx/draw_my_module.rb b/app/services/reports/docx/draw_my_module.rb
index 7f0f5380e..6b72a03f6 100644
--- a/app/services/reports/docx/draw_my_module.rb
+++ b/app/services/reports/docx/draw_my_module.rb
@@ -42,7 +42,7 @@ module Reports::Docx::DrawMyModule
     @docx.p do
       text I18n.t('projects.reports.elements.module.status')
       text ' '
-      text "[#{status.name}]", color: status.color.delete('#')
+      text "[#{status.name}]", color: (status.name == 'Not started' ? '000000' : status.color.delete('#'))
       if my_module.completed?
         text " #{I18n.t('my_modules.states.completed')} #{I18n.l(my_module.completed_on, format: :full)}"
       end
diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb
index bb6c1c479..34db825d1 100644
--- a/app/views/reports/elements/_my_module_element.html.erb
+++ b/app/views/reports/elements/_my_module_element.html.erb
@@ -25,7 +25,8 @@
     <p class="module-status">
       <% status = my_module.my_module_status %>
       <%= t('projects.reports.elements.module.status') %>
-      <span class="status-block" style="background: <%= status.color %>">
+      <span class="status-block" style="background: <%= status.color %>;
+        <%= 'color: #000000;' if status.name == 'Not started' %>">
         <%= status.name %>
       </span>
       <% if my_module.completed? %>

From 24a6150500320d385c41b4947b2118a3f27539fe Mon Sep 17 00:00:00 2001
From: Ivan Kljun <ivan@scinote.net>
Date: Thu, 24 Aug 2023 09:34:17 +0200
Subject: [PATCH 2/3] Add gray border to button 'Not started' at PDF reports

---
 app/views/reports/elements/_my_module_element.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb
index 34db825d1..ef32e0690 100644
--- a/app/views/reports/elements/_my_module_element.html.erb
+++ b/app/views/reports/elements/_my_module_element.html.erb
@@ -26,7 +26,7 @@
       <% status = my_module.my_module_status %>
       <%= t('projects.reports.elements.module.status') %>
       <span class="status-block" style="background: <%= status.color %>;
-        <%= 'color: #000000;' if status.name == 'Not started' %>">
+        <%= 'color: #000000; border: 1px solid #D0D5DD;' if status.name == 'Not started' %>">
         <%= status.name %>
       </span>
       <% if my_module.completed? %>

From 90199d35909d9aa6f982be5a1aa532bb6aff3de4 Mon Sep 17 00:00:00 2001
From: Ivan Kljun <ivan@scinote.net>
Date: Thu, 24 Aug 2023 14:52:11 +0200
Subject: [PATCH 3/3] Add method light_color? to my_module_status [SCI-9007]

---
 app/assets/javascripts/experiments/table.js                 | 2 +-
 app/assets/stylesheets/dashboard/current_tasks.scss         | 2 +-
 app/assets/stylesheets/experiment/canvas.scss               | 2 +-
 app/assets/stylesheets/experiment/table.scss                | 2 +-
 app/assets/stylesheets/my_modules/status_flow.scss          | 6 +++---
 app/controllers/dashboard/current_tasks_controller.rb       | 1 +
 app/models/my_module_status.rb                              | 4 ++++
 app/services/experiments/table_view_service.rb              | 3 ++-
 app/services/reports/docx/draw_my_module.rb                 | 2 +-
 app/views/canvas/full_zoom/_my_module.html.erb              | 2 +-
 app/views/dashboards/current_tasks/_task.html.erb           | 2 +-
 .../my_modules/modals/_status_flow_modal_body.html.erb      | 2 +-
 app/views/my_modules/status_flow/_task_flow_button.html.erb | 4 ++--
 app/views/reports/elements/_my_module_element.html.erb      | 2 +-
 14 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/experiments/table.js b/app/assets/javascripts/experiments/table.js
index a6e950d72..8a9aa9c5c 100644
--- a/app/assets/javascripts/experiments/table.js
+++ b/app/assets/javascripts/experiments/table.js
@@ -43,7 +43,7 @@ var ExperimnetTable = {
       return `<a href="${data.url}">${data.count}</a>`;
     },
     status: function(data) {
-      return `<div class="my-module-status ${data.name === 'Not started' ? 'btn-not-started' : ''}" 
+      return `<div class="my-module-status ${data.light_color ? 'status-light' : ''}" 
         style="background-color: ${data.color}">${data.name}</div>`;
     },
     assigned: function(data) {
diff --git a/app/assets/stylesheets/dashboard/current_tasks.scss b/app/assets/stylesheets/dashboard/current_tasks.scss
index 136b5d7a1..2186d154a 100644
--- a/app/assets/stylesheets/dashboard/current_tasks.scss
+++ b/app/assets/stylesheets/dashboard/current_tasks.scss
@@ -212,7 +212,7 @@
           font-weight: bold;
           padding: .25em .5em;
 
-          &.btn-not-started {
+          &.status-light {
             @include not-started;
           }
         }
diff --git a/app/assets/stylesheets/experiment/canvas.scss b/app/assets/stylesheets/experiment/canvas.scss
index ccbc5efa9..3028a7df6 100644
--- a/app/assets/stylesheets/experiment/canvas.scss
+++ b/app/assets/stylesheets/experiment/canvas.scss
@@ -36,7 +36,7 @@
       text-overflow: ellipsis;
       white-space: nowrap;
 
-      &.btn-not-started {
+      &.status-light {
         @include not-started;
       }
     }
diff --git a/app/assets/stylesheets/experiment/table.scss b/app/assets/stylesheets/experiment/table.scss
index dcc31613b..f31415f3f 100644
--- a/app/assets/stylesheets/experiment/table.scss
+++ b/app/assets/stylesheets/experiment/table.scss
@@ -360,7 +360,7 @@
       text-overflow: ellipsis;
       white-space: nowrap;
 
-      &.btn-not-started {
+      &.status-light {
         @include not-started;
       }
     }
diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss
index 087c41c39..ba726c29c 100644
--- a/app/assets/stylesheets/my_modules/status_flow.scss
+++ b/app/assets/stylesheets/my_modules/status_flow.scss
@@ -12,7 +12,7 @@
       text-align: left;
       width: 100%;
 
-      &.btn-not-started {
+      &.status-light {
         @include not-started;
       }
 
@@ -72,7 +72,7 @@
         white-space: nowrap;
       }
 
-      .btn-not-started {
+      .status-light {
         @include not-started;
       }
 
@@ -136,7 +136,7 @@
         padding: .5em;
         white-space: nowrap;
 
-        &.btn-not-started {
+        &.status-light {
           @include not-started;
         }
       }
diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb
index 703935006..e257f1a3b 100644
--- a/app/controllers/dashboard/current_tasks_controller.rb
+++ b/app/controllers/dashboard/current_tasks_controller.rb
@@ -121,6 +121,7 @@ module Dashboard
 
       tasks = tasks.search_by_name(current_user, current_team, task_filters[:query]) if task_filters[:query].present?
       tasks.joins(:my_module_status)
+           .includes(:my_module_status)
            .select(
              'my_modules.*',
              'my_module_statuses.name AS status_name',
diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb
index 64e13c237..de19eceef 100644
--- a/app/models/my_module_status.rb
+++ b/app/models/my_module_status.rb
@@ -67,6 +67,10 @@ class MyModuleStatus < ApplicationRecord
     mm_copy.errors.messages&.values&.flatten
   end
 
+  def light_color?
+    color == '#FFFFFF'
+  end
+
   private
 
   def next_in_same_flow
diff --git a/app/services/experiments/table_view_service.rb b/app/services/experiments/table_view_service.rb
index 9b99de934..df77fe152 100644
--- a/app/services/experiments/table_view_service.rb
+++ b/app/services/experiments/table_view_service.rb
@@ -154,7 +154,8 @@ module Experiments
     def status_presenter(my_module)
       {
         name: escape_input(my_module.my_module_status.name),
-        color: escape_input(my_module.my_module_status.color)
+        color: escape_input(my_module.my_module_status.color),
+        light_color: escape_input(my_module.my_module_status.light_color?)
       }
     end
 
diff --git a/app/services/reports/docx/draw_my_module.rb b/app/services/reports/docx/draw_my_module.rb
index 6b72a03f6..f79896093 100644
--- a/app/services/reports/docx/draw_my_module.rb
+++ b/app/services/reports/docx/draw_my_module.rb
@@ -42,7 +42,7 @@ module Reports::Docx::DrawMyModule
     @docx.p do
       text I18n.t('projects.reports.elements.module.status')
       text ' '
-      text "[#{status.name}]", color: (status.name == 'Not started' ? '000000' : status.color.delete('#'))
+      text "[#{status.name}]", color: (status.light_color? ? '000000' : status.color.delete('#'))
       if my_module.completed?
         text " #{I18n.t('my_modules.states.completed')} #{I18n.l(my_module.completed_on, format: :full)}"
       end
diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb
index faa32a901..a4a38a72e 100644
--- a/app/views/canvas/full_zoom/_my_module.html.erb
+++ b/app/views/canvas/full_zoom/_my_module.html.erb
@@ -65,7 +65,7 @@
       </div>
     </div>
 
-    <div class="status-label <%= 'btn-not-started' if my_module.my_module_status.name == 'Not started' %>"
+    <div class="status-label <%= 'status-light' if my_module.my_module_status.light_color? %>"
       style="--state-color: <%= my_module.my_module_status.color %>">
         <% if my_module.status_changing %>
           <i class="fas fa-spinner fa-spin"></i>
diff --git a/app/views/dashboards/current_tasks/_task.html.erb b/app/views/dashboards/current_tasks/_task.html.erb
index f8c479274..c0f4b1424 100644
--- a/app/views/dashboards/current_tasks/_task.html.erb
+++ b/app/views/dashboards/current_tasks/_task.html.erb
@@ -16,7 +16,7 @@
     <% end %>
   </div>
   <div class="task-status-container row-border">
-    <span class="task-status <%= 'btn-not-started' if task.status_name == 'Not started' %>"
+    <span class="task-status <%= 'status-light' if task.my_module_status.light_color? %>"
       style="background:<%= task.status_color %>">
         <%= task.status_name %>
     </span>
diff --git a/app/views/my_modules/modals/_status_flow_modal_body.html.erb b/app/views/my_modules/modals/_status_flow_modal_body.html.erb
index e86cf1cae..803ef4c57 100644
--- a/app/views/my_modules/modals/_status_flow_modal_body.html.erb
+++ b/app/views/my_modules/modals/_status_flow_modal_body.html.erb
@@ -11,7 +11,7 @@
           <%= t('my_modules.modals.status_flow_modal.current_status') %><i class="fas fa-long-arrow-alt-right"></i>
         <% end %>
       </div>
-      <div class="status-block <%= 'btn-not-started' if status.name == 'Not started' %>"
+      <div class="status-block <%= 'status-light' if status.light_color? %>"
         style="background: <%= status[:color] %>">
         <%= status[:name] %>
       </div>
diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb
index 165b49e82..ff23f7d52 100644
--- a/app/views/my_modules/status_flow/_task_flow_button.html.erb
+++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb
@@ -24,7 +24,7 @@
       data-status-check-url="<%= status_state_my_module_path(my_module) %>">
     <button class="btn btn-secondary dropdown-toggle
     <%= 'disabled' if my_module.status_changing || my_module.archived_branch? %>
-    <%= 'btn-not-started' if status.name == 'Not started' %>"
+    <%= 'status-light' if status.light_color? %>"
             type="button"
             data-toggle="dropdown"
             aria-haspopup="true"
@@ -48,7 +48,7 @@
             <span><%= t('my_module_statuses.dropdown.return_label') %></span>
             <i class="fas fa-long-arrow-alt-right"></i>
             <div class="status-container">
-              <div class="status-name <%= 'btn-not-started' if previous_s.name == 'Not started' %>"
+              <div class="status-name <%= 'status-light' if previous_s.light_color? %>"
                 style="<%= "background-color: #{previous_s.color}" %>"><%= previous_s.name %></div>
             </div>
           </li>
diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb
index ef32e0690..cc35050f2 100644
--- a/app/views/reports/elements/_my_module_element.html.erb
+++ b/app/views/reports/elements/_my_module_element.html.erb
@@ -26,7 +26,7 @@
       <% status = my_module.my_module_status %>
       <%= t('projects.reports.elements.module.status') %>
       <span class="status-block" style="background: <%= status.color %>;
-        <%= 'color: #000000; border: 1px solid #D0D5DD;' if status.name == 'Not started' %>">
+        <%= 'color: #000000; border: 1px solid #D0D5DD;' if status.light_color? %>">
         <%= status.name %>
       </span>
       <% if my_module.completed? %>