jro_apps/redmine Commit - r15560:db5bd2b2de47

My page - Spent time: configurable number of days to display (#8761)....

Jean-Philippe Lang -

r15560:db5bd2b2de47

parent child

Context file:

r15560:db5bd2b2de47

Collapse all files

app/views/my/update_page.js.erb created 644 +3 0

@@ -0,0 +1,3
	1	<% @updated_blocks.each do \|block\| %>
	2	$("#block-<%= block %>").html("<%= escape_javascript render_block_content(block.to_s, @user) %>");
	3	<% end %>

app/controllers/my_controller.rb +11 0

@@ -130,6 +130,17 class MyController < ApplicationController
130	redirect_to my_account_path	130	redirect_to my_account_path
131	end	131	end
132		132
		133	def update_page
		134	@user = User.current
		135	block_settings = params[:settings] \|\| {}
		136
		137	block_settings.each do \|block, settings\|
		138	@user.pref.update_block_settings(block, settings)
		139	end
		140	@user.pref.save
		141	@updated_blocks = block_settings.keys
		142	end
		143
133	# User's page layout configuration	144	# User's page layout configuration
134	def page_layout	145	def page_layout
135	@user = User.current	146	@user = User.current

app/helpers/my_helper.rb +10 -4

                   return
                 end
+                settings = user.pref.my_page_settings(block)
                 begin
-                  render(:partial => "my/blocks/#{block}", :locals => {:user => user})
+                  render(:partial => "my/blocks/#{block}", :locals => {:user => user, :settings => settings})
                 rescue ActionView::MissingTemplate
                   Rails.logger.warn("Template missing for block \"#{block}\" found in #{user.login} (id=#{user.id}) preferences")
                   return nil
                   to_a
               end
-              def timelog_items
+              def timelog_items(settings)
-                TimeEntry.
+                days = settings[:days].to_i
-                  where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, User.current.today - 6, User.current.today).
+                days = 7 if days < 1 || days > 365
+                entries = TimeEntry.
+                  where("#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", User.current.id, User.current.today - (days - 1), User.current.today).
                   joins(:activity, :project).
                   references(:issue => [:tracker, :status]).
                   includes(:issue => [:tracker, :status]).
                   order("#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC").
                   to_a
+                return entries, days
               end
             end

app/models/user_preference.rb +18 0

@@ -91,6 +91,19 class UserPreference < ActiveRecord::Base
91	self[:my_page_layout] = arg	91	self[:my_page_layout] = arg
92	end	92	end
93		93
		94	def my_page_settings(block=nil)
		95	s = self[:my_page_settings] \|\|= {}
		96	if block
		97	s[block] \|\|= {}
		98	else
		99	s
		100	end
		101	end
		102
		103	def my_page_settings=(arg)
		104	self[:my_page_settings] = arg
		105	end
		106
94	def remove_block(block)	107	def remove_block(block)
95	block = block.to_s.underscore	108	block = block.to_s.underscore
96	%w(top left right).each do \|f\|	109	%w(top left right).each do \|f\|
@@ -108,4 +121,9 class UserPreference < ActiveRecord::Base
108	my_page_layout['top'] \|\|= []	121	my_page_layout['top'] \|\|= []
109	my_page_layout['top'].unshift(block)	122	my_page_layout['top'].unshift(block)
110	end	123	end
		124
		125	def update_block_settings(block, settings)
		126	block_settings = my_page_settings(block).merge(settings.symbolize_keys)
		127	my_page_settings[block] = block_settings
		128	end
111	end	129	end

app/views/my/blocks/_timelog.html.erb +24 -5

@@ -1,18 +1,37
1	<%	1	<%
2	entries = timelog_items	2	entries, days = timelog_items(settings)
3	entries_by_day = entries.group_by(&:spent_on)	3	entries_by_day = entries.group_by(&:spent_on)
4	%>	4	%>
5	<% if User.current.allowed_to?(:log_time, nil, :global => true) %>	5
6	<div class="contextual">	6	<div class="contextual">
7	<%= link_to l(:button_log_time), new_time_entry_path, :class => "icon icon-add" %>	7	<%= link_to l(:button_log_time), new_time_entry_path, :class => "icon icon-add" if User.current.allowed_to?(:log_time, nil, :global => true) %>
		8	<%= link_to_function l(:label_options), "$('#timelog-settings').toggle();", :class => 'icon-only icon-settings' %>
8	</div>	9	</div>
9	<% end %>
10		10
11	<h3>	11	<h3>
12	<%= link_to l(:label_spent_time), time_entries_path(:user_id => 'me') %>	12	<%= link_to l(:label_spent_time), time_entries_path(:user_id => 'me') %>
13	(<%= l(:label_last_n_days, 7) %>: <%= l_hours_short entries.sum(&:hours) %>)	13	(<%= l(:label_last_n_days, days) %>: <%= l_hours_short entries.sum(&:hours) %>)
14	</h3>	14	</h3>
15		15
		16
		17	<div id="timelog-settings" style="display:none;">
		18	<%= form_tag({}, :remote => true) do %>
		19	<div class="box">
		20	<p>
		21	<label>
		22	<%= l(:button_show) %>:
		23	<%= text_field_tag 'settings[timelog][days]', days, :size => 6 %>
		24	<%= l(:label_day_plural) %>
		25	</label>
		26	</p>
		27	</div>
		28	<p>
		29	<%= submit_tag l(:button_save) %>
		30	<%= link_to_function l(:button_cancel), "$('#timelog-settings').toggle();" %>
		31	</p>
		32	<% end %>
		33	</div>
		34
16	<% if entries.any? %>	35	<% if entries.any? %>
17	<%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do %>	36	<%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do %>
18	<table class="list time-entries">	37	<table class="list time-entries">

config/routes.rb +1 0

               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
+              post 'my/page', :to => 'my#update_page'
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               get 'my/api_key', :to => 'my#show_api_key', :as => 'my_api_key'
               post 'my/api_key', :to => 'my#reset_api_key'

public/stylesheets/application.css +2 -1

             .icon-list { background-image: url(../images/text_list_bullets.png); }
             .icon-close { background-image: url(../images/close.png); }
             .icon-close:hover { background-image: url(../images/close_hl.png); }
+            .icon-settings { background-image: url(../images/changeset.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }
             .sort-handle.ajax-loading { background-image: url(../images/loading.gif); }
             tr.ui-sortable-helper { border:1px solid #e4e4e4; }
-            .contextual>.icon:not(:first-child), .buttons>.icon:not(:first-child) { margin-left: 5px; }
+            .contextual>*:not(:first-child), .buttons>.icon:not(:first-child) { margin-left: 5px; }
             img.gravatar {
               vertical-align: middle;

test/functional/my_controller_test.rb +12 0

@@ -221,6 +221,18 class MyControllerTest < Redmine::ControllerTest
221	end	221	end
222	end	222	end
223		223
		224	def test_update_page_with_blank_preferences
		225	user = User.generate!(:language => 'en')
		226	@request.session[:user_id] = user.id
		227
		228	xhr :post, :update_page, :settings => {'timelog' => {'days' => '14'}}
		229	assert_response :success
		230	assert_include '$("#block-timelog").html(', response.body
		231	assert_include '14 days', response.body
		232
		233	assert_equal({:days => "14"}, user.reload.pref.my_page_settings('timelog'))
		234	end
		235
224	def test_page_layout	236	def test_page_layout
225	get :page_layout	237	get :page_layout
226	assert_response :success	238	assert_response :success

test/integration/routing/my_test.rb +1 0

                 should_route 'POST /my/account/destroy' => 'my#destroy'
                 should_route 'GET /my/page' => 'my#page'
+                should_route 'POST /my/page' => 'my#update_page'
                 should_route 'GET /my' => 'my#index'
                 should_route 'GET /my/api_key' => 'my#show_api_key'

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