scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-12 16:14:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix due dates on calendar [SCI-11925]

Browse source
This commit is contained in:
Anton 2025-05-30 13:38:01 +02:00
parent 23e58a2fc2
commit 37a323fc25
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,28 +6,28 @@ module Dashboard
include MyModulesHelper
def show
date = params[:date].in_time_zone(current_user.time_zone)
date = params[:date].to_datetime
start_date = date.at_beginning_of_month.utc - 8.days
end_date = date.at_end_of_month.utc + 15.days
due_dates = current_user.my_modules.readable_by_user(current_user).active.uncomplete
.joins(experiment: :project)
.where(experiments: { archived: false })
.where(projects: { archived: false })
.where('my_modules.due_date > ? AND my_modules.due_date < ?', start_date, end_date)
.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)
render json: { events: due_dates.map { |i| { date: i.to_date } } }
end
def day
date = params[:date].in_time_zone(current_user.time_zone)
date = params[:date].to_datetime
start_date = date.utc
end_date = date.end_of_day.utc
my_modules = current_user.my_modules.readable_by_user(current_user).active.uncomplete
.joins(experiment: :project)
.where(experiments: { archived: false })
.where(projects: { archived: false })
.where('my_modules.due_date > ? AND my_modules.due_date < ?', start_date, end_date)
.where('my_modules.due_date >= ? AND my_modules.due_date <= ?', start_date, end_date)
.where(projects: { team_id: current_team.id })
render json: {
html: render_to_string(partial: 'shared/my_modules_list_partial',