From 79560e517d29518c27494d1c7e855c1e6ddffa3c Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Thu, 5 Mar 2020 14:40:46 +0100
Subject: [PATCH] Fix markup

---
 .../javascripts/dashboard/current_tasks.js    | 24 +++++++++----------
 .../stylesheets/dashboard/current_tasks.scss  |  6 +++++
 .../dashboard/current_tasks_controller.rb     |  5 +---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/dashboard/current_tasks.js b/app/assets/javascripts/dashboard/current_tasks.js
index 110b93007..441cd06e8 100644
--- a/app/assets/javascripts/dashboard/current_tasks.js
+++ b/app/assets/javascripts/dashboard/current_tasks.js
@@ -14,19 +14,19 @@ var DasboardCurrentTasksWidget = (function() {
 
   function generateTasksListHtml(json, container) {
     $.each(json.data, (i, task) => {
-      var currentTaskItem = `<a class="current-task-item" href="${task.link}">
-                               <div class="current-task-breadcrumbs">${task.project}<span class="slash">/</span>${task.experiment}</div>
-                               <div class="item-row">
-                                 <div class="task-name">${task.name}</div>
-                                 <div class="task-due-date ${task.state.class} ${task.due_date ? '' : 'hidden'}">
-                                  <i class="fas fa-calendar-day"></i> ${I18n.t('dashboard.current_tasks.due_date', { date: task.due_date })}
+      var currentTaskItem = ` <a class="current-task-item" href="${task.link}">
+                                <div class="current-task-breadcrumbs">${task.project}<span class="slash">/</span>${task.experiment}</div>
+                                <div class="item-row">
+                                  <div class="task-name">${task.name}</div>
+                                  <div class="task-due-date ${task.state.class} ${task.due_date ? '' : 'hidden'}">
+                                    <i class="fas fa-calendar-day"></i> ${I18n.t('dashboard.current_tasks.due_date', { date: task.due_date })}
+                                  </div>
+                                  <div class="task-progress-container ${task.state.class}">
+                                    <div class="task-progress" style="padding-left: ${task.steps_precentage}'%'"></div>
+                                    <div class="task-progress-label">${task.state.text}</div>
+                                  </div>
                                 </div>
-                                 <div class="task-progress-container ${task.state.class}">
-                                   <div class="task-progress" style="padding-left: ${task.steps_precentage}'%'"></div>
-                                   <div class="task-progress-label">${task.state.text}</div>
-                                 </div>
-                               </div>
-                             </a>`;
+                              </a>`;
       $(container).append(currentTaskItem);
     });
   }
diff --git a/app/assets/stylesheets/dashboard/current_tasks.scss b/app/assets/stylesheets/dashboard/current_tasks.scss
index f710292ae..5f826c176 100644
--- a/app/assets/stylesheets/dashboard/current_tasks.scss
+++ b/app/assets/stylesheets/dashboard/current_tasks.scss
@@ -265,6 +265,12 @@
       }
     }
 
+    &.day-prior {
+      .task-progress-label {
+        color: $brand-warning;
+      }
+    }
+
     &.completed {
       .task-progress {
         outline: $border-success;
diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb
index 96eb2f258..6fa582acf 100644
--- a/app/controllers/dashboard/current_tasks_controller.rb
+++ b/app/controllers/dashboard/current_tasks_controller.rb
@@ -27,7 +27,6 @@ module Dashboard
 
       tasks = filter_by_state(tasks)
 
-
       case task_filters[:sort]
       when 'date_desc'
         tasks = tasks.order('my_modules.due_date': :desc)
@@ -43,7 +42,7 @@ module Dashboard
 
       page = (params[:page] || 1).to_i
       tasks = tasks.with_step_statistics.search_by_name(current_user, current_team, task_filters[:query])
-                                        .preload(experiment: :project).page(page).per(Constants::INFINITE_SCROLL_LIMIT)
+                   .preload(experiment: :project).page(page).per(Constants::INFINITE_SCROLL_LIMIT)
 
       tasks_list = tasks.map do |task|
         { id: task.id,
@@ -97,9 +96,7 @@ module Dashboard
         task_state_text = t('dashboard.current_tasks.progress_bar.completed')
       else
         task_state_text = t('dashboard.current_tasks.progress_bar.in_progress')
-
         task_state_class = 'day-prior' if task.is_one_day_prior?
-
         if task.is_overdue?
           task_state_text = t('dashboard.current_tasks.progress_bar.overdue')
           task_state_class = 'overdue'