scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix markup

Browse source
This commit is contained in:
aignatov-bio 2020-03-03 14:25:28 +01:00
parent eb4a783337
commit da4967b3d0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/dashboard/calendars_controller.rb
View file

@ -10,8 +10,8 @@ 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)
.pluck(:due_date)
@ -22,8 +22,8 @@ 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)
.my_modules_list_partial

4
app/controllers/dashboard/current_tasks_controller.rb
View file

@ -18,8 +18,8 @@ module Dashboard
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)