jro_apps/redmine Commit - r1182:bbe8ea29e8d3

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

Display the last 30 days on the activity view rather than the current month....

Jean-Philippe Lang -

r1182:bbe8ea29e8d3

parent child

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                end
                def activity
-                 if params[:year] and params[:year].to_i > 1900
-                   @year = params[:year].to_i
-                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
-                     @month = params[:month].to_i
-                   end
+                 @days = Setting.activity_days_default.to_i
+                 if params[:from]
+                   begin; @date_to = params[:from].to_date; rescue; end
                  end
-                 @year ||= Date.today.year
-                 @month ||= Date.today.month
-                 case params[:format]
-                 when 'atom'
-                   # 30 last days
-                   @date_from = Date.today - 30
-                   @date_to = Date.today + 1
-                 else
-                   # current month
-                   @date_from = Date.civil(@year, @month, 1)
-                   @date_to = @date_from >> 1
-                 end
+                 @date_to ||= Date.today + 1
+                 @date_from = @date_to - @days
                  @event_types = %w(issues news files documents changesets wiki_pages messages)
                  @event_types.delete('wiki_pages') unless @project.wiki

                                        }, options
                end
+               def format_activity_day(date)
+                 date == Date.today ? l(:label_today).titleize : format_date(date)
+               end
                def format_activity_description(text)
                  h(truncate(text, 250))
                end

-             <h2><%= "#{month_name(@month)} #{@year}" %></h2>
+             <h2><%= l(:label_activity) %></h2>
              <div id="activity">
-             <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
-             <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
+             <% @events_by_day.keys.sort.reverse.each do |day| %>
+             <h3><%= format_activity_day(day) %></h3>
              <dl>
              <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
                <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
              <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
              <div style="float:left;">
-             <% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>
-             <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
-                                 {:update => "content", :url => prev_params}, {:href => url_for(prev_params)} %>
+             <%= link_to_remote(('&#171; ' + l(:label_previous)),
+                                {:update => "content", :url => params.merge(:from => @date_to - @days), :complete => 'window.scrollTo(0,0)'},
+                                {:href => url_for(params.merge(:from => @date_to - @days))}) %>
              </div>
              <div style="float:right;">
-             <% next_params = params.clone.update :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) %>
-             <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
-                                 {:update => "content", :url => next_params}, {:href => url_for(next_params)} %>
+             <%= link_to_remote((l(:label_next) + ' &#187;'),
+                                {:update => "content", :url => params.merge(:from => @date_to + @days), :complete => 'window.scrollTo(0,0)'},
+                                {:href => url_for(params.merge(:from => @date_to + @days))}) unless @date_to >= Date.today %>
              </div>
              &nbsp;
              <p class="other-formats">

              <p><label><%= l(:setting_per_page_options) %></label>
              <%= text_field_tag 'settings[per_page_options]', Setting.per_page_options_array.join(', '), :size => 20 %><br /><em><%= l(:text_comma_separated) %></em></p>
+             <p><label><%= l(:setting_activity_days_default) %></label>
+             <%= text_field_tag 'settings[activity_days_default]', Setting.activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
              <p><label><%= l(:setting_host_name) %></label>
              <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>

              issues_export_limit:
                format: int
                default: 500
+             activity_days_default:
+               format: int
+               default: 30
              per_page_options:
                default: '25,50,100'
              mail_from:

              text_assign_time_entries_to_project: Assign reported hours to the project
              text_destroy_time_entries: Delete reported hours
              text_reassign_time_entries: 'Reassign reported hours to this issue:'
+             setting_activity_days_default: Days displayed on project activity

              enumeration_issue_priorities: Ticket-Prioritäten
              enumeration_doc_categories: Dokumentenkategorien
              enumeration_activities: Aktivitäten (Zeiterfassung)
+             setting_activity_days_default: Days displayed on project activity

              setting_protocol: Protocol
              setting_per_page_options: Objects per page options
              setting_user_format: Users display format
+             setting_activity_days_default: Days displayed on project activity
              project_module_issue_tracking: Issue tracking
              project_module_time_tracking: Time tracking

              setting_protocol: Protocole
              setting_per_page_options: Options d'objets affichés par page
              setting_user_format: Format d'affichage des utilisateurs
+             setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
              project_module_issue_tracking: Suivi des demandes
              project_module_time_tracking: Suivi du temps passé

              text_assign_time_entries_to_project: Прикрепить зарегистрированное время к проекту
              text_destroy_time_entries: Удалить зарегистрированное время
              text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:'
+             setting_activity_days_default: Days displayed on project activity

              enumeration_issue_priorities: 項目優先權
              enumeration_doc_categories: 文件分類
              enumeration_activities: 活動 (time tracking)
+             setting_activity_days_default: Days displayed on project activity

              enumeration_issue_priorities: 问题优先级
              enumeration_doc_categories: 文档类别
              enumeration_activities: 活动（时间跟踪）
+             setting_activity_days_default: Days displayed on project activity

                end
                def test_activity
-                 get :activity, :id => 1, :year => 2.days.ago.to_date.year, :month => 2.days.ago.to_date.month
+                 get :activity, :id => 1
                  assert_response :success
                  assert_template 'activity'
                  assert_not_nil assigns(:events_by_day)
                               }
                             }
-                 get :activity, :id => 1, :year => 3.days.ago.to_date.year, :month => 3.days.ago.to_date.month
+                 get :activity, :id => 1, :from => 3.days.ago.to_date
                  assert_response :success
                  assert_template 'activity'
                  assert_not_nil assigns(:events_by_day)