Options to show 5th week and last week in monthly recurring UI.

closes #66
gregschmit · Oct 17, 2014 · deaddc9 · deaddc9
1 parent 20894a4
commit deaddc9
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.2.4 / 2014-10-17
+
+* Options to show 5th week and last week in monthly recurring UI. [#66](https://github.com/GetJobber/recurring_select/pull/66) (thanks @naomiaro)
+
 # 1.2.3 / 2014-10-01
 
 * Revert fix hidden dialog when called from Bootstrap modal. [#47](https://github.com/GetJobber/recurring_select/pull/47)

diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ You have to translate JavaScript texts too by including the locale file in your
 
 For other languages include a JavaScript file like this:
 
-```javascript
+```coffeescript
 $.fn.recurring_select.texts = {
   repeat: "Repeat"
   frequency: "Frequency"
@@ -117,8 +117,18 @@ $.fn.recurring_select.texts = {
   day_of_week: "Day of week"
   cancel: "Cancel"
   ok: "OK"
-  days_first_letter: ["S", "M", "T", "W", "T", "F", "S" ]
-  order: ["1st", "2nd", "3rd", "4th"]
+  days_first_letter: ["S", "M", "T", "W", "T", "F", "S"]
+  order: ["1st", "2nd", "3rd", "4th", "5th", "Last"]
+}
+```
+
+Javascript options include:
+
+```coffeescript
+$.fn.recurring_select.options = {
+  monthly: {
+    show_week: [true, true, true, true, false, false] //display week 1, 2 .... Last
+  }
 }
 ```
 

diff --git a/app/assets/javascripts/recurring_select.js.coffee b/app/assets/javascripts/recurring_select.js.coffee
@@ -73,6 +73,12 @@ $.fn.recurring_select = (method) ->
   else
     $.error( "Method #{method} does not exist on jQuery.recurring_select" );
 
+$.fn.recurring_select.options = {
+  monthly: {
+    show_week: [true, true, true, true, false, false]
+  }
+}
+
 $.fn.recurring_select.texts = {
   repeat: "Repeat"
   last_day: "Last Day"
@@ -93,5 +99,6 @@ $.fn.recurring_select.texts = {
   summary: "Summary"
   first_day_of_week: 0
   days_first_letter: ["S", "M", "T", "W", "T", "F", "S" ]
-  order: ["1st", "2nd", "3rd", "4th"]
+  order: ["1st", "2nd", "3rd", "4th", "5th", "Last"]
+  show_week: [true, true, true, true, false, false]
 }
diff --git a/app/assets/javascripts/recurring_select/fr.js.coffee b/app/assets/javascripts/recurring_select/fr.js.coffee
@@ -19,5 +19,6 @@ $.fn.recurring_select.texts = {
   summary: "Résumé"
   first_day_of_week: 1
   days_first_letter: ["D", "L", "M", "M", "J", "V", "S" ]
-  order: ["1er", "2ème", "3ème", "4ème"]
+  order: ["1er", "2ème", "3ème", "4ème", "5ème", "Dernier"]
+  show_week: [true, true, true, true, false, false]
 }
diff --git a/app/assets/javascripts/recurring_select_dialog.js.coffee.erb b/app/assets/javascripts/recurring_select_dialog.js.coffee.erb
@@ -193,15 +193,17 @@ window.RecurringSelectDialog =
       monthly_calendar = section.find(".rs_calendar_week")
       monthly_calendar.html ""
       row_labels = $.fn.recurring_select.texts["order"]
+      show_row = $.fn.recurring_select.options["monthly"]["show_week"]
       cell_str = $.fn.recurring_select.texts["days_first_letter"]
 
-      for num in [1..4]
-        monthly_calendar.append "<span>#{row_labels[num - 1]}</span>"
-        for day_of_week in [0..6]
-          day_link = $("<a>", {text: cell_str[day_of_week]})
-          day_link.attr("day", day_of_week)
-          day_link.attr("instance", num)
-          monthly_calendar.append day_link
+      for num, index in [1, 2, 3, 4, 5, -1]
+        if show_row[index]
+          monthly_calendar.append "<span>#{row_labels[index]}</span>"
+          for day_of_week in [0..6]
+            day_link = $("<a>", {text: cell_str[day_of_week]})
+            day_link.attr("day", day_of_week)
+            day_link.attr("instance", num)
+            monthly_calendar.append day_link
       $.each @current_rule.hash.validations.day_of_week, (key, value) ->
         $.each value, (index, instance) ->
           section.find("a[day='#{key}'][instance='#{instance}']").addClass("selected")

diff --git a/lib/recurring_select/version.rb b/lib/recurring_select/version.rb
@@ -1,3 +1,3 @@
 module RecurringSelect
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end
diff --git a/spec/dummy/app/assets/javascripts/application.js b/spec/dummy/app/assets/javascripts/application.js
@@ -8,3 +8,9 @@
 //= require jquery_ujs
 //= require recurring_select
 //= require_tree .
+
+$.fn.recurring_select.options = {
+  monthly: {
+    show_week: [true, true, true, true, true, true]
+  }
+};