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

Add sorting to Project's experiments overview [SCI-361]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2016-12-23 15:40:01 +01:00
parent e16c826bb1
commit 4d3e002c81
3 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/projects_controller.rb
View file

@ -251,6 +251,7 @@ class ProjectsController < ApplicationController
def show def show
# This is the "info" view # This is the "info" view
current_organization_switch(@project.organization) current_organization_switch(@project.organization)
@current_sort = params[:sort].to_s
end end
def notifications def notifications

10
app/models/project.rb
View file

@ -107,8 +107,14 @@ class Project < ActiveRecord::Base
return (self.user_projects.select { |up| up.user == user }).first.role return (self.user_projects.select { |up| up.user == user }).first.role
end end
def active_experiments(ordered = 'created_at DESC') def active_experiments(sort_by = :new)
experiments.is_archived(false).order(ordered) sort = case sort_by
when 'old' then { created_at: :asc }
when 'atoz' then { name: :asc }
when 'ztoa' then { name: :desc }
else { created_at: :desc }
end
experiments.is_archived(false).order(sort)
end end
def archived_experiments def archived_experiments

27
app/views/projects/show.html.erb
View file

@ -6,9 +6,9 @@
<div class="col-sm-12" <div class="col-sm-12"
id="data-holder" id="data-holder"
data-project-id="<%= @project.id %>"> data-project-id="<%= @project.id %>">
<% if can_create_experiment(@project) %> <div class="row">
<div class="row"> <div class="col-sm-12">
<div class="col-sm-12"> <% if can_create_experiment(@project) %>
<%= link_to new_project_experiment_url(@project), <%= link_to new_project_experiment_url(@project),
remote: true, remote: true,
type: "button", type: "button",
@ -22,9 +22,26 @@
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%=t 'experiments.new.create' %></span> <span class="hidden-xs"><%=t 'experiments.new.create' %></span>
<% end %> <% end %>
<% end %>
<!-- experiment sort -->
<div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="hidden-xs"><%= t'projects.index.sort' %></span>
<span class="visible-xs-inline"><i class="glyphicon glyphicon-sort"></i></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="sortMenu">
<% ["new", "old", "atoz", "ztoa"].each do |sort| %>
<% if @current_sort != sort %>
<li><a href="?<%= {sort: sort}.reject{|v| v.to_s == "0"}.to_query %>"><%= t('projects.index.sort_' + sort) %></a></li>
<% else %>
<li class="disabled"><a href="#"><%= t('projects.index.sort_' + sort) %></a></li>
<% end %>
<% end %>
</ul>
</div> </div>
</div> </div>
<% end %> </div>
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<h2><%= t'projects.show.page_title' %></h2> <h2><%= t'projects.show.page_title' %></h2>
@ -33,7 +50,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<% @project.active_experiments.each_with_index do |experiment, index| %> <% @project.active_experiments(@current_sort).each_with_index do |experiment, index| %>
<%= render partial: 'projects/show/experiment', <%= render partial: 'projects/show/experiment',
locals: { experiment: experiment } %> locals: { experiment: experiment } %>