Calendar:

* added an helper and moved the rendering code to a shared partial (used by project calendar and my calendar)
* first day of week can now be set in lang files (general_first_day_of_week)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@815 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 9 insertions, 15 deletions

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 11aa7f1d0..bbb3a6e22 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -16,6 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MyController < ApplicationController
+  helper :issues
+  
   layout 'base'
   before_filter :require_login
 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d2d132458..cf1325518 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -512,26 +512,18 @@ class ProjectsController < ApplicationController
       end    
     end
     @year ||= Date.today.year
-    @month ||= Date.today.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)        
+    @month ||= Date.today.month    
+    @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
     
-    @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])
-    
-    @ending_events_by_days = @events.group_by {|event| event.due_date}
-    @starting_events_by_days = @events.group_by {|event| event.start_date}
+    events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
+    @calendar.events = events
     
     render :layout => false if request.xhr?
   end