scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-02 09:54:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix experiment sorting by archived on [SCI-10563]

Browse source
This commit is contained in:
Andrej 2024-04-02 12:41:32 +02:00
parent fe6879a0e8
commit cf79812b4b
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/services/lists/experiments_service.rb
View file

@ -75,11 +75,31 @@ module Lists
created_at: 'experiments.created_at',
name: 'experiments.name',
code: 'experiments.id',
archived_on: 'COALESCE(experiments.archived_on, projects.archived_on)',
archived_on: 'archived_on',
updated_at: 'experiments.updated_at',
completed_tasks: 'completed_task_count',
description: 'experiments.description'
}
end
def sort_records
return unless @params[:order] && sortable_columns[order_params[:column].to_sym].present?
@records = case order_params[:column]
when 'archived_on'
if order_params[:dir] == 'asc'
@records.order(Arel.sql('COALESCE(experiments.archived_on, projects.archived_on) ASC'))
.group('experiments.archived_on', 'projects.archived_on')
else
@records.order(Arel.sql('COALESCE(experiments.archived_on, projects.archived_on) DESC'))
.group('experiments.archived_on', 'projects.archived_on')
end
else
sort_by = "#{sortable_columns[order_params[:column].to_sym]} #{sort_direction(order_params)}"
@records.order(sort_by)
end
@records = @records.order(:id)
end
end
end