scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add sorting options to experiment task table view [SCI-9120] (#6102)

Browse source
This commit is contained in:
wandji 2023-09-06 15:14:17 +01:00 committed by GitHub
parent 8cecdd86ea
commit a25e6fdda3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/experiment.rb
View file

@ -122,8 +122,9 @@ class Experiment < ApplicationRecord
def validate_view_state(view_state) def validate_view_state(view_state)
if %w(canvas table).exclude?(view_state.state.dig('my_modules', 'view_type')) || if %w(canvas table).exclude?(view_state.state.dig('my_modules', 'view_type')) ||
%w(atoz ztoa due_first due_last).exclude?(view_state.state.dig('my_modules', 'active', 'sort')) ||
%w(atoz ztoa due_first due_last %w(atoz ztoa due_first due_last
id_asc id_desc).exclude?(view_state.state.dig('my_modules', 'active', 'sort')) ||
%w(atoz ztoa due_first due_last id_asc id_desc
archived_old archived_new).exclude?(view_state.state.dig('my_modules', 'archived', 'sort')) archived_old archived_new).exclude?(view_state.state.dig('my_modules', 'archived', 'sort'))
view_state.errors.add(:state, :wrong_state) view_state.errors.add(:state, :wrong_state)
end end

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

@ -219,8 +219,9 @@ module Experiments
@view_state = experiment.current_view_state(@user) @view_state = experiment.current_view_state(@user)
@view_mode = @params[:view_mode] || 'active' @view_mode = @params[:view_mode] || 'active'
@sort = @view_state.state.dig('my_modules', @view_mode, 'sort') || 'atoz' @sort = @view_state.state.dig('my_modules', @view_mode, 'sort') || 'atoz'
if @params[:sort] && @sort != @params[:sort] && %w(due_first due_last atoz ztoa if @params[:sort] &&
archived_old archived_new).include?(@params[:sort]) @sort != @params[:sort] &&
%w(due_first due_last atoz ztoa id_asc id_desc archived_old archived_new).include?(@params[:sort])
@view_state.state['my_modules'].merge!(Hash[@view_mode, { 'sort': @params[:sort] }.stringify_keys]) @view_state.state['my_modules'].merge!(Hash[@view_mode, { 'sort': @params[:sort] }.stringify_keys])
@view_state.save! @view_state.save!
@sort = @view_state.state.dig('my_modules', @view_mode, 'sort') @sort = @view_state.state.dig('my_modules', @view_mode, 'sort')
@ -237,6 +238,10 @@ module Experiments
records.order(:name) records.order(:name)
when 'ztoa' when 'ztoa'
records.order(name: :desc) records.order(name: :desc)
when 'id_asc'
records.order(:id)
when 'id_desc'
records.order(id: :desc)
when 'archived_old' when 'archived_old'
records.order(Arel.sql('COALESCE(my_modules.archived_on, my_modules.archived_on) ASC')) records.order(Arel.sql('COALESCE(my_modules.archived_on, my_modules.archived_on) ASC'))
when 'archived_new' when 'archived_new'

4
app/views/experiments/_table_toolbar.html.erb
View file

@ -27,9 +27,9 @@
<i class="sn-icon sn-icon-sort-up"></i> <i class="sn-icon sn-icon-sort-up"></i>
</button> </button>
<ul id="sortMenuDropdown" class="dropdown-menu sort-task-menu <%= params[:view_mode] %> dropdown-menu-right" aria-labelledby="sortMenu"> <ul id="sortMenuDropdown" class="dropdown-menu sort-task-menu <%= params[:view_mode] %> dropdown-menu-right" aria-labelledby="sortMenu">
<% %w(atoz ztoa due_first due_last archived_old archived_new).each_with_index do |sort, i| %> <% %w(atoz ztoa due_first due_last id_asc id_desc archived_old archived_new).each_with_index do |sort, i| %>
<% if i.even? && i.positive? %> <% if i.even? && i.positive? %>
<li class="divider" <%= i > 3 ? 'data-view-mode=archived' : '' %>></li> <li class="divider" <%= i > 5 ? 'data-view-mode=archived' : '' %>></li>
<% end %> <% end %>
<li <%= %w(archived_new archived_old).include?(sort) ? 'data-view-mode=archived' : '' %>> <li <%= %w(archived_new archived_old).include?(sort) ? 'data-view-mode=archived' : '' %>>
<a class="<%= 'selected' if @current_sort == sort %>" <a class="<%= 'selected' if @current_sort == sort %>"