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

Improve sorting of task results [SCI-7543]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2022-12-01 17:13:26 +01:00
parent 0788072df1
commit 78660fb1aa
8 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.rubocop.yml
View file

@ -273,7 +273,7 @@ Style/SymbolArray:
EnforcedStyle: percent
Style/SymbolProc:
IgnoredMethods:
AllowedMethods:
- respond_to
- define_method
@ -352,7 +352,7 @@ Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
IgnoredMethods: ['describe', 'context']
AllowedMethods: ['describe', 'context']
Metrics/ClassLength:
Enabled: false

6
app/controllers/my_modules_controller.rb
View file

@ -296,10 +296,12 @@ class MyModulesController < ApplicationController
@results = @results.page(params[:page]).per(Constants::RESULTS_PER_PAGE_LIMIT)
@results = case @results_order
when 'old' then @results.order(updated_at: :asc)
when 'old' then @results.order(created_at: :asc)
when 'old_updated' then @results.order(updated_at: :asc)
when 'new_updated' then @results.order(updated_at: :desc)
when 'atoz' then @results.order(name: :asc)
when 'ztoa' then @results.order(name: :desc)
else @results.order(updated_at: :desc)
else @results.order(created_at: :desc)
end
end

6
app/helpers/reports_helper.rb
View file

@ -93,9 +93,13 @@ module ReportsHelper
when 'ztoa'
results.order(name: :desc)
when 'new'
results.order(created_at: :desc)
when 'old_updated'
results.order(updated_at: :asc)
when 'new_updated'
results.order(updated_at: :desc)
else
results.order(updated_at: :asc)
results.order(created_at: :asc)
end
end

2
app/models/report.rb
View file

@ -55,7 +55,7 @@ class Report < ApplicationRecord
table_results: true,
text_results: true,
result_comments: true,
result_order: 'atoz',
result_order: 'new',
activities: true
}
}.freeze

2
app/views/my_modules/_result.html.erb
View file

@ -33,7 +33,7 @@
<a class="result-panel-collapse-link" href="#result-panel-<%= result.id %>" data-toggle="collapse">
<span class="fas fa-caret-right"></span>
<strong><%= result.name %></strong> |
<span><%= t('my_modules.results.published_on', timestamp: l(result.created_at, format: :full), user: h(result.user.full_name)).html_safe %></span>
<span><%= t('my_modules.results.published_on_html', timestamp: l(result.created_at, format: :full), user: h(result.user.full_name)) %></span>
</a>
</div>
<div class="panel-collapse collapse" id="result-panel-<%= result.id %>" role="tabpanel">

2
app/views/my_modules/results.html.erb
View file

@ -61,6 +61,8 @@
<li><%= link_to t('general.sort_new.ztoa'), results_my_module_path(@my_module, page: params[:page], order: 'ztoa'), class: (@results_order == 'ztoa' ? 'selected' : '') %></li>
<li><%= link_to t('general.sort_new.old'), results_my_module_path(@my_module, page: params[:page], order: 'old'), class: (@results_order == 'old' ? 'selected' : '') %></li>
<li><%= link_to t('general.sort_new.new'), results_my_module_path(@my_module, page: params[:page], order: 'new'), class: (@results_order == 'new' ? 'selected' : '') %></li>
<li><%= link_to t('general.sort_new.old_updated'), results_my_module_path(@my_module, page: params[:page], order: 'old_updated'), class: (@results_order == 'old_updated' ? 'selected' : '') %></li>
<li><%= link_to t('general.sort_new.new_updated'), results_my_module_path(@my_module, page: params[:page], order: 'new_updated'), class: (@results_order == 'new_updated' ? 'selected' : '') %></li>
</ul>
</div>
</div>

6
app/views/reports/wizard/_third_step.html.erb
View file

@ -117,8 +117,10 @@
options_for_select([
[t('projects.reports.wizard.third_step.atoz'), 'atoz'],
[t('projects.reports.wizard.third_step.ztoa'), 'ztoa'],
[t('projects.reports.wizard.third_step.new_results'), 'new'],
[t('projects.reports.wizard.third_step.old_results'), 'old']
[t('projects.reports.wizard.third_step.old'), 'old'],
[t('projects.reports.wizard.third_step.new'), 'new'],
[t('projects.reports.wizard.third_step.old_updated'), 'old_updated'],
[t('projects.reports.wizard.third_step.new_updated'), 'new_updated']
], selected: report.settings.dig(:task, :result_order)),
class: 'order-results' %>
</div>

28
config/locales/en.yml
View file

@ -644,10 +644,12 @@ en:
results: "Results"
all_results: "Include all results"
order_results: "Order results"
atoz: "Alphabetically A to Z"
ztoa: "Alphabetically Z to A"
new_results: "Newest first"
old_results: "Oldest first"
atoz: "Name A to Z"
ztoa: "Name Z to A"
new: "Added last"
old: "Added first"
new_updated: "Modified last"
old_updated: "Modified first"
file_results: "File results"
insert_pages_from_pdf: "Insert pages from PDF and docx files into the report"
pdf_warning: "This may increase report generation time."
@ -762,13 +764,13 @@ en:
no_items: "No items"
result_asset:
file_name: "%{file}"
user_time: "Uploaded by %{user} on %{timestamp}."
user_time: "Added on %{timestamp} by %{user}."
full_preview_attached: "[full document attached to report]"
result_table:
table_name: "%{name}"
user_time: "Created by %{user} on %{timestamp}."
user_time: "Added on %{timestamp} by %{user}."
result_text:
user_time: "Created by %{user} on %{timestamp}."
user_time: "Added on %{timestamp} by %{user}."
step:
sidebar_name: "Step %{pos}: %{name}"
step_pos: "Step %{pos}:"
@ -1111,7 +1113,7 @@ en:
new_text_result: "Text"
new_table_result: "Table"
new_asset_result: "File"
published_on: "Published on <em>%{timestamp}</em> by <em>%{user}</em>"
published_on_html: "Added on <em>%{timestamp}</em> by <em>%{user}</em>"
published_table: "entered a table on %{timestamp}."
published_text: "entered a text on %{timestamp}."
published_asset: "uploaded a file on %{timestamp}."
@ -3168,10 +3170,12 @@ en:
archived_new_html: "<span class=\"fa-stack\"><i class=\"fas fa-long-arrow-alt-up\"></i><i class=\"fas fa-archive\"></i></span>Archived last"
archived_old_html: "<span class=\"fa-stack\"><i class=\"fas fa-long-arrow-alt-down\"></i><i class=\"fas fa-archive\"></i></span>Archived first"
sort_new:
new: "Newest"
old: "Oldest"
atoz: "A-Z"
ztoa: "Z-A"
new: "Added last"
old: "Added first"
new_updated: "Modified last"
old_updated: "Modified first"
atoz: "Name A to Z"
ztoa: "Name Z to A"
module:
one: "task"
other: "tasks"