Actions
Defect #33952
closed
Spent time details are displayed in incorrect order when sorted by week and date
Start date:
Due date:
% Done:
0%
Estimated time:
Resolution:
Fixed
Affected version:
Description
When specifying the sorting condition of Week column and Date column in the custom query, it doesn't sort well.
- Defining a custom query
- List of spent time with custom query
Files
Updated by Yuichi HARADA about 4 years ago
The sort condition Date(:spent_on) and Week(:tweek), defined by app/models/time_entry_query.rb( source:trunk/app/models/time_entry_query.rb#L24 ) are the same table columns.
# Date
QueryColumn.new(:spent_on, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :default_order => 'desc', :groupable => true),
# Week
QueryColumn.new(:tweek, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :caption => :label_week),
Updated by Yuichi HARADA about 4 years ago
- File fixed-33952.patch fixed-33952.patch added
I think the following patch will fix the problem.
diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index c8f8eeaeb..c5c2099ad 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -25,7 +25,7 @@ class TimeEntryQuery < Query
QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
QueryColumn.new(:spent_on, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :default_order => 'desc', :groupable => true),
TimestampQueryColumn.new(:created_on, :sortable => "#{TimeEntry.table_name}.created_on", :default_order => 'desc', :groupable => true),
- QueryColumn.new(:tweek, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :caption => :label_week),
+ QueryColumn.new(:tweek, :sortable => ["#{TimeEntry.table_name}.tyear", "#{TimeEntry.table_name}.tweek"], :caption => :label_week),
QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement}),
QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true),
Updated by Go MAEDA almost 4 years ago
- Target version set to Candidate for next minor release
Updated by Go MAEDA almost 4 years ago
- Target version changed from Candidate for next minor release to 4.1.2
I have slightly updated the test code.
Setting the target version to 4.1.2.
Updated by Go MAEDA almost 4 years ago
- File 33952-v2.patch 33952-v2.patch added
Go MAEDA wrote:
I have slightly updated the test code.
I forgot to attach a patch.
Updated by Go MAEDA almost 4 years ago
- Subject changed from Sorting of Week column and Date column does not work to Sorting spent time details by week and date does not work
Updated by Go MAEDA almost 4 years ago
- Subject changed from Sorting spent time details by week and date does not work to Spent time details are displayed in incorrect order when sorted by week and date
- Status changed from Confirmed to Closed
- Assignee set to Go MAEDA
- Target version changed from 4.1.2 to 4.2.0
- Resolution set to Fixed
Committed the patch. Thank you.
Actions