Commit Graph

39 Commits

Author SHA1 Message Date
Jean-Philippe Lang 797a9f1ea9 Refactor: #issues_to_csv and #entries_to_csv merged into QueriesHelper#query_to_csv.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11448 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 11:07:43 +00:00
Jean-Philippe Lang f8c649320f Makes all time entry columns available in the CSV export.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11442 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-19 20:41:54 +00:00
Toshi MARUYAMA 5778bdd4f7 replace tabs to spaces at app/helpers/timelog_helper.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11406 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-16 13:03:54 +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 96fca0b08f Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10916 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 19:16:32 +00:00
Jean-Philippe Lang 3a178a42cf Add "last 2 weeks" preset to time entries reporting (#11862).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 17:40:00 +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 79b12c73d9 Display of multi custom fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8726 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-29 22:01:40 +00:00
Jean-Philippe Lang 18ea835739 Display "none" inside square brackets.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8644 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-14 09:55:49 +00:00
Jean-Philippe Lang e43df59168 Added encoding comment to helpers (#9792).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-14 19:56:23 +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
Toshi MARUYAMA a79e0fa5f6 fix csv decimal separator of time entry csv (#8368)
Contributed by Francisco José Martínez.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7950 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-27 12:14:20 +00:00
Toshi MARUYAMA b95fd6315c fix time entry csv last line encoding (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7947 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-27 10:53:08 +00:00
Toshi MARUYAMA 55d41cf77b backout r6356: HTML escape of app/helpers/timelog_helper.rb
When export time entry csv, "undefined method `h'" error raises.
HTML escapes in view.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7941 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-27 08:25:12 +00:00
Toshi MARUYAMA 4a3581c748 fix malformed time entry report csv encoding in case of unable to convert (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-16 08:29:18 +00:00
Toshi MARUYAMA 4b5d50e40a fix malformed time log csv encoding in case of unable to convert (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-16 08:10:53 +00:00
Toshi MARUYAMA dbc616c928 remove trailing white-spaces from app/helpers/timelog_helper.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6911 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-31 13:11:39 +00:00
Toshi MARUYAMA fb8f3a7ada HTML escape at app/helpers/timelog_helper.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6356 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-02 12:52:36 +00:00
Jean-Philippe Lang 663f0c83b2 Fixes time report with JRuby (#5404).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3708 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 12:18:11 +00:00
Jean-Philippe Lang d8c5549168 Changes misleading scopes on Enumeration.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3083 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-21 12:00:49 +00:00
Jean-Philippe Lang 1a65eb8b08 Don't reveal issue subjects if user is only allowed to view spent time (#3187).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3043 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 14:10:09 +00:00
Jean-Philippe Lang cbeeaa4d4d Refactoring ApplicationHelper#link_to_issue.
Now displays issue subject by default.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3040 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 12:53:50 +00:00
Jean-Philippe Lang 27e3fa2bed Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3007 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-04 13:22:26 +00:00
Eric Davis e615266e9a Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities
* Added Project#activities to return all the Systemwide and Project specific
  activities, excluding Systemwide ones that are overridden.
* Added some tests for TimelogHelper.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:39 +00:00
Eric Davis e76d4c5c4c Added an active field track if an Enumeration is active on the frontend view.
* Changed TimelogHelper#activity_collection_for_select_options to only use
  active TimeEntryActivities.
* Changed TimelogHelper#activity_collection_for_select_options to return a blank
  option if the time_entry's current activity is inactive.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:28 +00:00
Eric Davis 62e58f26b0 Changed Enumerations to use a Single Table Inheritance
* Added migrations to change Enumerations to an STI relationship
* Added TimeEntryActivity model (STI)
* Added DocumentCategory model (STI)
* Added IssuePriority model (STI)
* Added Enumeration#get_subclasses to get a list of the subclasses of Enumeration
* Changed Enumeration to use the STI type field instead of the opt field
* Changed Enumeration#opt to return the old opt values but with a deprecation warning.
* Removed Enumeration::OPTIONS
* Removed the dynamic named_scopes in favor of specific named_scopes.  Kept for
  compatibility reasons.
* Added Enumeration#default so each subclass can easily find it's default record.
* Fixed Enumeration#default to use the STI scoping with a fake default scope for finding Enumeration's default.
* Added a 'all' named scope for getting all records in order by position.
* Added Deprecation warnings to the old named_scopes in Enumerations.
* Moved various methods off of Enumeration and onto the concrete classes
* Changed the EnumerationsController to use types
* Updated the Enumeration list template
* Added has_many relationships to the Enumeration STI classes.
* Fixes for tests.

  #3007

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2777 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-30 23:30:36 +00:00
Jean-Philippe Lang 801ad70cb7 Show timelog reports for non-versioned issues (#3051).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2643 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-30 20:09:57 +00:00
Jean-Philippe Lang 4601ed2f3a Replaces Enumeration.get_values and Enumeration.default with named scopes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2472 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-15 13:33:09 +00:00
Jean-Philippe Lang 11346455a1 Fixed: Details time log report CSV export doesn't honour date format from settings (patch #2466 by Russell Hind).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2302 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-24 08:58:03 +00:00
Jean-Philippe Lang 696d21f8c8 Adds cross-project time reports support (#994).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1778 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-31 16:34:54 +00:00
Jean-Philippe Lang f54c2d812d Adds custom fields to the time entries csv export.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-07-22 19:02:40 +00:00
Jean-Philippe Lang 1424b0f215 Addq "please select" to activity select box if no activity is set as default (#937).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1602 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-29 12:01:20 +00:00
Jean-Philippe Lang a4a8b6381e Adds a key in lang files (general_csv_decimal_separator) to set the decimal separator (point or comma) in csv exports (#1372).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1591 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-26 19:46:57 +00:00
Jean-Philippe Lang a3c89d4f69 Custom fields (list and boolean) can be used as criteria in time report (#1012).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1340 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-04-09 17:45:39 +00:00
Jean-Philippe Lang 5d34548539 CSV export added to timelog report (#1009).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1338 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-04-07 17:18:09 +00:00
Jean-Philippe Lang 200842ba5e Propagates time tracking to the parent project (closes #433). Time report enhancements.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1176 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-02-27 20:50:19 +00:00
Jean-Philippe Lang 328df74dd1 Adds date range filter and pagination on time entries detail view (closes #434).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1173 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-02-26 18:15:58 +00:00
Jean-Philippe Lang faa3d984ab Added time report.
Report can be generated by member/activity/tracker/version and year/month/week for the selected period.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@572 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-06-24 16:07:06 +00:00
Jean-Philippe Lang 8d54d97007 Simple time tracking functionality added. Time can be logged at issue or project level.
There's no aggregation reports for now, it's just possible to see all time entries for a project or an issue.
A new "activities" enumeration is added.
Permission for a role to log time must be set (new "Time tracking" section in role permissions screen).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@368 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-03-23 12:22:31 +00:00