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

Experiment table improve due date sorting [SCI-7746][SCI-7704]

Browse source
This commit is contained in:
Anton 2023-01-12 11:57:48 +01:00
parent b7077b53b7
commit 3dff1b8a8c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/experiments_controller.rb
View file

@ -607,9 +607,9 @@ class ExperimentsController < ApplicationController
def sort_my_modules(records, sort) def sort_my_modules(records, sort)
case sort case sort
when 'due_first' when 'due_first'
records.order(:due_date) records.order(:due_date, :name)
when 'due_last' when 'due_last'
records.order(Arel.sql("COALESCE(due_date, DATE '1900-01-01') DESC")) records.order(Arel.sql("COALESCE(due_date, DATE '2100-01-01') DESC"), :name)
when 'atoz' when 'atoz'
records.order(:name) records.order(:name)
when 'ztoa' when 'ztoa'

4
app/services/experiments/table_view_service.rb
View file

@ -225,9 +225,9 @@ module Experiments
def sort_records(records) def sort_records(records)
case @sort case @sort
when 'due_first' when 'due_first'
records.order(:due_date) records.order(:due_date, :name)
when 'due_last' when 'due_last'
records.order(Arel.sql("COALESCE(due_date, DATE '1900-01-01') DESC")) records.order(Arel.sql("COALESCE(due_date, DATE '2100-01-01') DESC"), :name)
when 'atoz' when 'atoz'
records.order(:name) records.order(:name)
when 'ztoa' when 'ztoa'