From 89f0e7ca8e4612904de5ff9b98a5de991a01b632 Mon Sep 17 00:00:00 2001 From: Carlos Goce Date: Sun, 25 Jan 2015 17:29:34 +0100 Subject: Fix calendar blank spaces --- lib/carlosgoce/calendar.rb | 10 +++++++--- lib/carlosgoce/layout/layouts.rb | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/carlosgoce/calendar.rb b/lib/carlosgoce/calendar.rb index 48f0071..4445d1f 100644 --- a/lib/carlosgoce/calendar.rb +++ b/lib/carlosgoce/calendar.rb @@ -29,9 +29,13 @@ module CarlosGoce } # Formatted days creation - days_before_week_start = Date.new(@year, 1, h[1][:days].first).wday - empty_days = [''] * (days_before_week_start - 1) - h[month][:formatted_days] = empty_days + h[1][:days] + # @todo First day defaults to Sunday but I should be able to change it to Monday + day_of_week = Date.new(@year, month, h[1][:days].first).wday + # Fix to change to spanish + days_before_week_start = if day_of_week == 0 then 6 else day_of_week -1 end + + empty_days = [''] * days_before_week_start + h[month][:formatted_days] = empty_days + h[month][:days] end end } diff --git a/lib/carlosgoce/layout/layouts.rb b/lib/carlosgoce/layout/layouts.rb index 6a18513..e4be1c5 100644 --- a/lib/carlosgoce/layout/layouts.rb +++ b/lib/carlosgoce/layout/layouts.rb @@ -12,8 +12,8 @@ module CarlosGoce data[:months].each do |k, month| days = month[:formatted_days] - cells = days.to_a.each_slice(6).to_a - cells.unshift %w(L M X V S D) + cells = days.to_a.each_slice(7).to_a + cells.unshift %w(L M X J V S D) cells.unshift [month[:name]] tables << make_table(cells, cell_style: {align: :center, size: 7, border_width: 0}) -- cgit v1.2.3