From: Go MAEDA <maeda@farend.jp>
Date: Mon, 14 Jan 2019 05:19:31 +0000 (+0000)
Subject: Add "nwday" class to non-working days in calendar (#27096).
X-Git-Tag: 4.1.0~1157
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c9f460bb7dee4afd7d71f0c4535bb5dec650c9e6;p=redmine.git

Add "nwday" class to non-working days in calendar (#27096).

Patch by Marius BALTEANU.


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

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index d2cc0c53c..72b65e433 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -29,6 +29,7 @@ class MyController < ApplicationController
   helper :custom_fields
   helper :queries
   helper :activities
+  helper :calendars
 
   def index
     page
diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb
index a807ec426..fe3796c7f 100644
--- a/app/helpers/calendars_helper.rb
+++ b/app/helpers/calendars_helper.rb
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module CalendarsHelper
+  include Redmine::Utils::DateCalculation
+
   def link_to_previous_month(year, month, options={})
     target_year, target_month = if month == 1
                                   [year - 1, 12]
@@ -59,6 +61,7 @@ module CalendarsHelper
   def calendar_day_css_classes(calendar, day)
     css = day.month==calendar.month ? 'even' : 'odd'
     css << " today" if User.current.today == day
+    css << " nwday" if non_working_week_days.include?(day.cwday)
     css
   end
 end
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 7e1cd4413..da9db3d64 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -130,8 +130,24 @@ class CalendarsControllerTest < Redmine::ControllerTest
     get :show, :params => {
         :query_id => 6
       }
-      
+
     assert_response :success
     assert_select 'h2', :text => 'Open issues grouped by tracker'
   end
+
+  def test_show_calendar_day_css_classes
+    get :show, :params => {
+        :month => '12',
+        :year => '2016'
+      }
+    assert_response :success
+
+    assert_select 'tr:nth-child(2)' do
+      assert_select 'td.week-number', :text => '49'
+      # non working days should have "nwday" CSS class
+      assert_select 'td.nwday', 2
+      assert_select 'td.nwday', :text => '4'
+      assert_select 'td.nwday', :text => '10'
+    end
+  end
 end