Commit Graph

42 Commits

Author SHA1 Message Date
Go MAEDA
6e21ae7209 Fix RuboCop offense Layout/SpaceAfterComma, one of the offenses enabled in rubocop-rails-omakase (#39887).
git-svn-id: https://svn.redmine.org/redmine/trunk@22953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2024-08-12 08:36:05 +00:00
Marius Balteanu
38d950df55 Remove current year from source file copyright headers and update year in footer to 2024 (#40043).
git-svn-id: https://svn.redmine.org/redmine/trunk@22746 e93f8b46-1217-0410-a6f0-8f06a7374b81
2024-02-26 22:55:54 +00:00
Go MAEDA
0b6f4c6811 Ruby 2.7: Fix RuboCop offense Performance/MapCompact (#38134).
git-svn-id: https://svn.redmine.org/redmine/trunk@22055 e93f8b46-1217-0410-a6f0-8f06a7374b81
2023-01-17 01:38:27 +00:00
Go MAEDA
92bd67c279 Update copyright year to 2023 (#38141).
git-svn-id: https://svn.redmine.org/redmine/trunk@22013 e93f8b46-1217-0410-a6f0-8f06a7374b81
2023-01-01 06:19:35 +00:00
Go MAEDA
ee1476f802 Fix RuboCop offense Rails/Pluck (#37248).
git-svn-id: https://svn.redmine.org/redmine/trunk@21928 e93f8b46-1217-0410-a6f0-8f06a7374b81
2022-10-28 07:50:11 +00:00
Go MAEDA
f2ae2b9936 Duplicate activities in time entry report when project-specific activies exist (#20018).
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21371 e93f8b46-1217-0410-a6f0-8f06a7374b81
2022-01-19 13:33:11 +00:00
Go MAEDA
3686b77eb6 Update copyright year in source files to 2022 (#36379).
git-svn-id: http://svn.redmine.org/redmine/trunk@21342 e93f8b46-1217-0410-a6f0-8f06a7374b81
2022-01-02 05:29:10 +00:00
Go MAEDA
ee64cb5cb1 Remove unused argument from Redmine::Helpers::TimeReport (#33079).
Patch by Kevin Fischer.


git-svn-id: http://svn.redmine.org/redmine/trunk@21196 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-08-19 13:13:26 +00:00
Go MAEDA
3e36b5c452 Update copyright year in source files to 2021 (#33069).
git-svn-id: http://svn.redmine.org/redmine/trunk@20846 e93f8b46-1217-0410-a6f0-8f06a7374b81
2021-03-25 06:58:56 +00:00
Toshi MARUYAMA
e8980ad770 fix source indent of lib/redmine/helpers/time_report.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-08-07 12:43:24 +00:00
Go MAEDA
795ebcc17c Use field_activity rather than label_activity in the context of time tracking (#33186).
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19619 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-26 05:58:47 +00:00
Go MAEDA
907e0173e4 Update copyright year in source files to 2020 (#33069).
git-svn-id: http://svn.redmine.org/redmine/trunk@19553 e93f8b46-1217-0410-a6f0-8f06a7374b81
2020-03-03 00:24:10 +00:00
Go MAEDA
9eafc3e9a2 Remove trailing whitespaces from lib (#31506).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18231 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-06-06 14:50:14 +00:00
Go MAEDA
4082069c75 Update copyright year.
git-svn-id: http://svn.redmine.org/redmine/trunk@18198 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-05-25 07:36:06 +00:00
Go MAEDA
07b3087fda Enable frozen_string_literal for some files under app and lib directory (#26561).
git-svn-id: http://svn.redmine.org/redmine/trunk@17977 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-16 09:37:35 +00:00
Go MAEDA
5861160ffc Add "frozen_string_literal: false" for all files (#26561).
This will be changed to true in the future.


git-svn-id: http://svn.redmine.org/redmine/trunk@17947 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 01:32:57 +00:00
Go MAEDA
391bc8b763 Only allow the use of visible custom fields in time entry reports (#29162).
Patch by Holger Just.


git-svn-id: http://svn.redmine.org/redmine/trunk@17446 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-07-12 21:58:22 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright.
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 08:40:31 +00:00
Jean-Philippe Lang
71d88e5535 Get rid of sort_helper when using queries.
git-svn-id: http://svn.redmine.org/redmine/trunk@16390 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-03-13 19:17:59 +00:00
Jean-Philippe Lang
3539cfcf0f Adds issue tracker and status columns and filters on spent time list (#23401).
git-svn-id: http://svn.redmine.org/redmine/trunk@15738 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-08-20 10:27:39 +00:00
Jean-Philippe Lang
0e514b3144 Fully qualify the Version class in Redmine::Helpers::TimeReport (#23269).
Patch by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@15645 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-07-12 19:45:05 +00:00
Jean-Philippe Lang
ed50d42210 Replace Date.today with User.current.today (#22320).
Depending on the offset between a user's configured timezone and the server
timezone, Date.today may be more or less often wrong from the user's
perspective, leading to things like issues marked as overdue too early or too
late, or yesterday / tomorrow being displayed / selected where 'today' is
intended.

A test case illustrating the problem with Issue#overdue? is included

Patch by Jens Kraemer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15379 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-05-07 10:42:22 +00:00
Jean-Philippe Lang
cda9c63d9c Updates copyright for 2016.
git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-03-13 10:30:10 +00:00
Jean-Philippe Lang
000124f44f Copyright update.
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-11 09:09:50 +00:00
Jean-Philippe Lang
01ac064935 Exclude custom fields with multiple values from time report criteria (#16519).
git-svn-id: http://svn.redmine.org/redmine/trunk@13055 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-04-06 11:29:44 +00:00
Toshi MARUYAMA
0aaf7f799a Rails4: replace deprecated Relation#sum with finder options at lib/redmine/helpers/time_report.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@12881 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-14 02:33:00 +00:00
Toshi MARUYAMA
35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Jean-Philippe Lang
2e2e2cfe42 Merged custom fields format refactoring.
git-svn-id: http://svn.redmine.org/redmine/trunk@12400 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-14 08:22:43 +00:00
Jean-Philippe Lang
0a6a7f0ed7 Fixed that time entries report by week breaks on edge cases (#5329).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11471 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-24 12:18:29 +00:00
Jean-Philippe Lang
85b872f340 Makes project custom fields available on spent time report (#1766).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11459 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-24 08:57:04 +00:00
Jean-Philippe Lang
e396a0eebe Copyright for 2013 (#12788).
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Jean-Philippe Lang
902d4bcf1c Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11108 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-03 13:59:15 +00:00
Jean-Philippe Lang
03329b5d4d Use joins instead of sub-queries (#12713).
Sub-queries in group by are not supported by SQLServer.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11107 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-03 13:57:27 +00:00
Jean-Philippe Lang
d6ecfcf50c Rename the Member column to User on the time entries list.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10968 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-09 18:09:44 +00:00
Jean-Philippe Lang
f8895a7cdd Adds TimeEntryQuery for listing time entries.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10967 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-09 17:57:18 +00:00
Jean-Philippe Lang
536747b747 Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10917 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 20:23:48 +00:00
Jean-Philippe Lang
76eeb64d1a Fixed that time report raises a SQL error if there are multiple CustomValue for a time entry (#11160).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9831 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-14 10:47:04 +00:00
Jean-Philippe Lang
ba5a052c8c Copyright update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 12:56:53 +00:00
Jean-Philippe Lang
a6a627f445 Adds "Status" to the time report criteria (#9985).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8643 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-14 09:51:56 +00:00
Jean-Philippe Lang
6a1830e9e3 Replace raw SQL with a .count call.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8093 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-05 18:27:10 +00:00
Jean-Philippe Lang
81afd9d0c7 Fixed time report broken by r8085.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8092 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-05 17:58:01 +00:00
Jean-Philippe Lang
caf898d7d1 Extracted time report logic from the controller.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-02 18:46:43 +00:00