jro_apps/redmine Commit - r804:ec51cdd0f992

Calendar:...

Jean-Philippe Lang -

r804:ec51cdd0f992

parent child

Context file:

r804:ec51cdd0f992

Expand all files

app/views/common/_calendar.rhtml created 644 +36 0

@@ -0,0 +1,36
	1	<table class="cal">
	2	<thead>
	3	<tr><td></td><% 7.times do \|i\| %><th><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
	4	</thead>
	5	<tbody>
	6	<tr>
	7	<% day = calendar.startdt
	8	while day <= calendar.enddt %>
	9	<%= "<th>#{day.cweek}</th>" if day.cwday == calendar.first_wday %>
	10	<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
	11	<p class="day-num"><%= day.day %></p>
	12	<% calendar.events_on(day).each do \|i\| %>
	13	<% if i.is_a? Issue %>
	14	<div class="tooltip">
	15	<%= if day == i.start_date && day == i.due_date
	16	image_tag('arrow_bw.png')
	17	elsif day == i.start_date
	18	image_tag('arrow_from.png')
	19	elsif day == i.due_date
	20	image_tag('arrow_to.png')
	21	end %>
	22	<%= h("#{i.project.name} -") unless @project && @project == i.project %>
	23	<%= link_to_issue i %>: <%= h(truncate(i.subject, 30)) %>
	24	<span class="tip"><%= render_issue_tooltip i %></span>
	25	</div>
	26	<% else %>
	27	<%= link_to_version i, :class => "icon icon-package" %>
	28	<% end %>
	29	<% end %>
	30	</td>
	31	<%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
	32	<% day = day + 1
	33	end %>
	34	</tr>
	35	</tbody>
	36	</table>

lib/redmine/helpers/calendar.rb created 644 +76 0

@@ -0,0 +1,76
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module Helpers
	20
	21	# Simple class to compute the start and end dates of a calendar
	22	class Calendar
	23	include GLoc
	24	attr_reader :startdt, :enddt
	25
	26	def initialize(date, lang = current_language, period = :month)
	27	@date = date
	28	@events = []
	29	@ending_events_by_days = {}
	30	@starting_events_by_days = {}
	31	set_language lang
	32	case period
	33	when :month
	34	@startdt = Date.civil(date.year, date.month, 1)
	35	@enddt = (@startdt >> 1)-1
	36	# starts from the first day of the week
	37	@startdt = @startdt - (@startdt.cwday - first_wday)%7
	38	# ends on the last day of the week
	39	@enddt = @enddt + (last_wday - @enddt.cwday)%7
	40	when :week
	41	@startdt = date - (date.cwday - first_wday)%7
	42	@enddt = date + (last_wday - date.cwday)%7
	43	else
	44	raise 'Invalid period'
	45	end
	46	end
	47
	48	# Sets calendar events
	49	def events=(events)
	50	@events = events
	51	@ending_events_by_days = @events.group_by {\|event\| event.due_date}
	52	@starting_events_by_days = @events.group_by {\|event\| event.start_date}
	53	end
	54
	55	# Returns events for the given day
	56	def events_on(day)
	57	((@ending_events_by_days[day] \|\| []) + (@starting_events_by_days[day] \|\| [])).uniq
	58	end
	59
	60	# Calendar current month
	61	def month
	62	@date.month
	63	end
	64
	65	# Return the first day of week
	66	# 1 = Monday ... 7 = Sunday
	67	def first_wday
	68	@first_dow \|\|= (l(:general_first_day_of_week).to_i - 1)%7 + 1
	69	end
	70
	71	def last_wday
	72	@last_dow \|\|= (first_wday + 5)%7 + 1
	73	end
	74	end
	75	end
	76	end

test/unit/calendar_test.rb created 644 +43 0

@@ -0,0 +1,43
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class CalendarTest < Test::Unit::TestCase
	21
	22	def test_monthly
	23	c = Redmine::Helpers::Calendar.new(Date.today, :fr, :month)
	24	assert_equal [1, 7], [c.startdt.cwday, c.enddt.cwday]
	25
	26	c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :fr, :month)
	27	assert_equal ['2007-06-25'.to_date, '2007-08-05'.to_date], [c.startdt, c.enddt]
	28
	29	c = Redmine::Helpers::Calendar.new(Date.today, :en, :month)
	30	assert_equal [7, 6], [c.startdt.cwday, c.enddt.cwday]
	31	end
	32
	33	def test_weekly
	34	c = Redmine::Helpers::Calendar.new(Date.today, :fr, :week)
	35	assert_equal [1, 7], [c.startdt.cwday, c.enddt.cwday]
	36
	37	c = Redmine::Helpers::Calendar.new('2007-07-14'.to_date, :fr, :week)
	38	assert_equal ['2007-07-09'.to_date, '2007-07-15'.to_date], [c.startdt, c.enddt]
	39
	40	c = Redmine::Helpers::Calendar.new(Date.today, :en, :week)
	41	assert_equal [7, 6], [c.startdt.cwday, c.enddt.cwday]
	42	end
	43	end

app/controllers/my_controller.rb +2 0

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MyController < ApplicationController
+              helper :issues
               layout 'base'
               before_filter :require_login

app/controllers/projects_controller.rb +7 -15

                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
+                @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
-                @date_from = Date.civil(@year, @month, 1)
-                @date_to = (@date_from >> 1)-1
-                # start on monday
-                @date_from = @date_from - (@date_from.cwday-1)
-                # finish on sunday
-                @date_to = @date_to + (7-@date_to.cwday)
-                @events = []
+                events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
-                  @events += Issue.find(:all,
+                  events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
-                                       :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
+                                       :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                        ) unless @selected_tracker_ids.empty?
                 end
-                @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
+                events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
+                @calendar.events = events
-                @ending_events_by_days = @events.group_by {|event| event.due_date}
-                @starting_events_by_days = @events.group_by {|event| event.start_date}
                 render :layout => false if request.xhr?
               end

app/views/my/blocks/_calendar.rhtml +5 -44

@@ -1,47 +1,8
1	<h3><%= l(:label_calendar) %></h3>	1	<h3><%= l(:label_calendar) %></h3>
2		2
3	<%	3	<% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week)
4	@date_from = Date.today - (Date.today.cwday-1)	4	calendar.events = Issue.find :all,
5	@date_to = Date.today + (7-Date.today.cwday)	5	:conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{\|m\| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt],
6	@issues = Issue.find :all,	6	:include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %>
7	:conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{\|m\| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to],
8	:include => [:project, :tracker] unless @user.projects.empty?
9	@issues \|\|= []
10	%>
11		7
12	<table class="cal">	8	<%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %>
13	<thead><tr>
14	<td></td>
15	<% 1.upto(7) do \|d\| %>
16	<th align="center" width="14%"><%= day_name(d) %></th>
17	<% end %>
18	</tr></thead>
19	<tbdoy>
20	<tr height="100">
21	<% day = @date_from
22	while day <= @date_to
23	if day.cwday == 1 %>
24	<th valign="middle"><%= day.cweek %></th>
25	<% end %>
26	<td valign="top" width="14%" class="<%= day.month==@month ? "even" : "odd" %>">
27	<p align="right"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
28	<% day_issues = []
29	@issues.each { \|i\| day_issues << i if i.start_date == day or i.due_date == day }
30	day_issues.each do \|i\| %>
31	<%= if day == i.start_date and day == i.due_date
32	image_tag('arrow_bw.png')
33	elsif day == i.start_date
34	image_tag('arrow_from.png')
35	elsif day == i.due_date
36	image_tag('arrow_to.png')
37	end %>
38	<small><%= link_to_issue i %>: <%=h i.subject.sub(/^(.{30}[^\s]\s).$/, '\1 (...)') %></small><br />
39	<% end %>
40	</td>
41	<%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
42	<%
43	day = day + 1
44	end %>
45	</tr>
46	</tbody>
47	</table> No newline at end of file

app/views/projects/calendar.rhtml +1 -49

@@ -15,55 +15,7
15	</td></tr>	15	</td></tr>
16	</table>	16	</table>
17		17
18	<table class="cal">	18	<%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
19	<thead>
20	<tr>
21	<td></td>
22	<% 1.upto(7) do \|d\| %>
23	<th style="width:14%"><%= day_name(d) %></th>
24	<% end %>
25	</tr>
26	</thead>
27	<tbody>
28	<tr style="height:100px">
29	<% day = @date_from
30	while day <= @date_to
31	if day.cwday == 1 %>
32	<th><%= day.cweek %></th>
33	<% end %>
34	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %> <%= Date.today == day ? 'today' : '' %>" style="width:14%;">
35	<p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
36	<% ((@ending_events_by_days[day] \|\| []) + (@starting_events_by_days[day] \|\| [])).uniq.each do \|i\| %>
37	<% if i.is_a? Issue %>
38	<div class="tooltip">
39	<%= if day == i.start_date and day == i.due_date
40	image_tag('arrow_bw.png')
41	elsif day == i.start_date
42	image_tag('arrow_from.png')
43	elsif day == i.due_date
44	image_tag('arrow_to.png')
45	end %>
46	<small>
47	<%= h("#{i.project.name} -") unless @project && @project == i.project %>
48	<%= link_to_issue i %>:
49	<%= h(truncate(i.subject, 30)) %>
50	</small>
51	<span class="tip">
52	<%= render_issue_tooltip i %>
53	</span>
54	</div>
55	<% else %>
56	<small><%= link_to_version i, :class => "icon icon-package" %></small>
57	<% end %>
58	<% end %>
59	</td>
60	<%= '</tr><tr style="height:100px">' if day.cwday >= 7 and day!=@date_to %>
61	<%
62	day = day + 1
63	end %>
64	</tr>
65	</tbody>
66	</table>
67		19
68	<%= image_tag 'arrow_from.png' %>  <%= l(:text_tip_task_begin_day) %><br />	20	<%= image_tag 'arrow_from.png' %>  <%= l(:text_tip_task_begin_day) %><br />
69	<%= image_tag 'arrow_to.png' %>  <%= l(:text_tip_task_end_day) %><br />	21	<%= image_tag 'arrow_to.png' %>  <%= l(:text_tip_task_end_day) %><br />

lang/bg.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Понеделник,Вторник,Сряда,Четвъртък,Петък,Събота,Неделя
+            general_first_day_of_week: '1'
             notice_account_updated: Профилът е обновен успешно.
             notice_account_invalid_creditentials: Невалиден потребител или парола.

lang/cs.yml +1 0

             general_csv_encoding: UTF-8
             general_pdf_encoding: UTF-8
             general_day_names: Pondělí,Úterý,Středa,Čtvrtek,Pátek,Sobota,Neděle
+            general_first_day_of_week: '1'
             notice_account_updated: Účet byl úspěšně změněn.
             notice_account_invalid_creditentials: Chybné jméno nebo heslo

lang/de.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag
+            general_first_day_of_week: '1'
             notice_account_updated: Konto wurde erfolgreich aktualisiert.
             notice_account_invalid_creditentials: Benutzer oder Kennwort unzulässig

lang/en.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday
+            general_first_day_of_week: '7'
             notice_account_updated: Account was successfully updated.
             notice_account_invalid_creditentials: Invalid user or password

lang/es.yml +1 0

             general_csv_encoding: ISO-8859-15
             general_pdf_encoding: ISO-8859-15
             general_day_names: Lunes,Martes,Miércoles,Jueves,Viernes,Sábado,Domingo
+            general_first_day_of_week: '1'
             notice_account_updated: Cuenta creada correctamente.
             notice_account_invalid_creditentials: Inválido usuario o contraseña

lang/fr.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche
+            general_first_day_of_week: '1'
             notice_account_updated: Le compte a été mis à jour avec succès.
             notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.

lang/it.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Lunedì,Martedì,Mercoledì,Giovedì,Venerdì,Sabato,Domenica
+            general_first_day_of_week: '1'
             notice_account_updated: L'utenza è stata aggiornata.
             notice_account_invalid_creditentials: Nome utente o password non validi.

lang/ja.yml +1 0

             general_csv_encoding: SJIS
             general_pdf_encoding: SJIS
             general_day_names: 月曜日,火曜日,水曜日,木曜日,金曜日,土曜日,日曜日
+            general_first_day_of_week: '7'
             notice_account_updated: アカウントが更新されました。
             notice_account_invalid_creditentials: ユーザ名もしくはパスワードが無効

lang/nl.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Maandag, Dinsdag, Woensdag, Donderdag, Vrijdag, Zaterdag, Zondag
+            general_first_day_of_week: '7'
             notice_account_updated: Account is met succes gewijzigd
             notice_account_invalid_creditentials: Incorrecte gebruikersnaam of wachtwoord

lang/pl.yml +1 0

             general_csv_encoding: ISO-8859-2
             general_pdf_encoding: ISO-8859-2
             general_day_names: Poniedziałek,Wtorek,Środa,Czwartek,Piątek,Sobota,Niedziela
+            general_first_day_of_week: '1'
             notice_account_updated: Konto prawidłowo zaktualizowane.
             notice_account_invalid_creditentials: Zły użytkownik lub hasło

lang/pt-br.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Segunda,Terca,Quarta,Quinta,Sexta,Sabado,Domingo
+            general_first_day_of_week: '1'
             notice_account_updated: Conta foi alterada com sucesso.
             notice_account_invalid_creditentials: Usuario ou senha invalido.

lang/pt.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo
+            general_first_day_of_week: '1'
             notice_account_updated: Conta foi atualizada com sucesso.
             notice_account_invalid_creditentials: Usuário ou senha inválidos.

lang/ro.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Luni,Marti,Miercuri,Joi,Vineri,Sambata,Duminica
+            general_first_day_of_week: '7'
             notice_account_updated: Contul a fost creat cu succes.
             notice_account_invalid_creditentials: Numele utilizator sau parola este invalida.

lang/sv.yml +1 0

             general_csv_encoding: ISO-8859-1
             general_pdf_encoding: ISO-8859-1
             general_day_names: Måndag,Tisdag,Onsdag,Torsdag,Fredag,Lördag,Söndag
+            general_first_day_of_week: '7'
             notice_account_updated: Kontot har uppdaterats
             notice_account_invalid_creditentials: Fel användarnamn eller lösenord

lang/zh.yml +1 0

             general_csv_encoding: gb2312
             general_pdf_encoding: Big5
             general_day_names: 一,二,三,四,五,六,日
+            general_first_day_of_week: '7'
             notice_account_updated: 帐户更新成功。
             notice_account_invalid_creditentials: 用户名或密码不正确

public/stylesheets/application.css +6 -1

             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 8px 0 6px 0;border: 1px solid #d7d7d7;}
+            table.cal thead th {width: 14%;}
+            table.cal tbody tr {height: 100px;}
             table.cal th { background-color:#EEEEEE; padding: 4px; }
-            table.cal td {border: 1px solid #d7d7d7;}
+            table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
+            table.cal td p.day-num {font-size: 1.1em; text-align:right;}
+            table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
+            table.cal td.today p.day-num {font-weight: bold;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}

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