From 9fa8818a5d1c599e20f43108c75ccc9745d6a49f Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Tue, 3 Mar 2020 16:10:52 +0100
Subject: [PATCH] Fix markup

---
 app/controllers/dashboard/calendars_controller.rb    | 12 ++++++------
 .../dashboard/current_tasks_controller.rb            | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/dashboard/calendars_controller.rb b/app/controllers/dashboard/calendars_controller.rb
index 0282e2814..65afdd28d 100644
--- a/app/controllers/dashboard/calendars_controller.rb
+++ b/app/controllers/dashboard/calendars_controller.rb
@@ -10,10 +10,10 @@ module Dashboard
       end_date = date.at_end_of_month.utc + 14.days
       due_dates = current_user.my_modules.active.uncomplete
                               .joins(experiment: :project)
-                              .where(experiments: {archived: false})
-                              .where(projects: {archived: false})
+                              .where(experiments: { archived: false })
+                              .where(projects: { archived: false })
                               .where('my_modules.due_date > ? AND my_modules.due_date < ?', start_date, end_date)
-                              .joins(:protocols).where('protocols.team_id = ?', current_team.id)
+                              .joins(:protocols).where(protocols: { team_id: current_team.id })
                               .pluck(:due_date)
       render json: { events: due_dates.map { |i| { date: i } } }
     end
@@ -22,10 +22,10 @@ module Dashboard
       date = DateTime.parse(params[:date]).utc
       my_modules = current_user.my_modules.active.uncomplete
                                .joins(experiment: :project)
-                               .where(experiments: {archived: false})
-                               .where(projects: {archived: false})
+                               .where(experiments: { archived: false })
+                               .where(projects: { archived: false })
                                .where('DATE(my_modules.due_date) = DATE(?)', date)
-                               .where('projects.team_id = ?', current_team.id)
+                               .where(projects: { team_id: current_team.id })
                                .my_modules_list_partial
       render json: {
         html: render_to_string(partial: 'shared/my_modules_list_partial.html.erb', locals: { task_groups: my_modules })
diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb
index bb635a7eb..e24e5881e 100644
--- a/app/controllers/dashboard/current_tasks_controller.rb
+++ b/app/controllers/dashboard/current_tasks_controller.rb
@@ -12,19 +12,19 @@ module Dashboard
       tasks = if @experiment
                 @experiment.my_modules.active
               elsif @project
-                MyModule.active.where('projects.id': @project.id)
+                MyModule.active.where(projects: { id: @project.id })
               else
                 MyModule.active.viewable_by_user(current_user, current_team)
               end
 
       tasks = tasks.joins(experiment: :project)
-                   .where(experiments: {archived: false})
-                   .where(projects: {archived: false})
+                   .where(experiments: { archived: false })
+                   .where(projects: { archived: false })
 
       if task_filters[:mode] == 'assigned'
-        tasks = tasks.left_outer_joins(:user_my_modules).where('user_my_modules.user_id': current_user.id)
+        tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id })
       end
-      tasks = tasks.where('my_modules.state': task_filters[:view])
+      tasks = tasks.where(my_modules: { state: task_filters[:view] })
                    .search_by_name(current_user, current_team, task_filters[:query])
 
       case task_filters[:sort]