From f06dc56b4024161a6529795d7ed158b14e428fc9 Mon Sep 17 00:00:00 2001 From: Arona Date: Mon, 25 May 2020 13:32:09 +0100 Subject: [PATCH] Refactor calendar tests --- RIGS/finance.py | 1 + RIGS/tests/pages.py | 22 +++ RIGS/tests/test_functional.py | 226 +--------------------- RIGS/tests/test_rigs.py | 284 ++++++++++++++++++++++++++-- users/templates/profile_detail.html | 4 +- 5 files changed, 297 insertions(+), 240 deletions(-) diff --git a/RIGS/finance.py b/RIGS/finance.py index 8ce1582f..d0b9fffd 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -102,6 +102,7 @@ class InvoiceVoid(generic.View): class InvoiceDelete(generic.DeleteView): model = models.Invoice + template_name = 'invoice_confirm_delete.html' def get(self, request, pk): obj = self.get_object() diff --git a/RIGS/tests/pages.py b/RIGS/tests/pages.py index 38fe9349..65184306 100644 --- a/RIGS/tests/pages.py +++ b/RIGS/tests/pages.py @@ -179,3 +179,25 @@ class GenericList(BasePage): _search_selector = (By.CSS_SELECTOR, 'div.input-group:nth-child(2) > input:nth-child(1)') _search_go_selector = (By.ID, 'id_search') _add_item_selector = (By.CSS_SELECTOR, '.btn-success') + + +class UserPage(BasePage): + URL_TEMPLATE = 'user/' + + _api_key_selector = (By.XPATH, '/html/body/div[1]/div[2]/div[2]/div/div/dl/dd[1]') + _cal_url_selector = (By.ID, 'cal-url') + _generation_button_selector = (By.LINK_TEXT, 'Generate API Key') + + @property + def api_key(self): + return self.find_element(*self._api_key_selector).text + + @property + def cal_url(self): + return self.find_element(*self._cal_url_selector).text + + def toggle_filter(self, type_name): + self.find_element(By.XPATH, "//input[@value='" + type_name + "']").click() + + def generate_key(self): + self.find_element(*self._generation_button_selector).click() diff --git a/RIGS/tests/test_functional.py b/RIGS/tests/test_functional.py index 0bb63d78..e222a2d4 100644 --- a/RIGS/tests/test_functional.py +++ b/RIGS/tests/test_functional.py @@ -27,231 +27,7 @@ from PyRIGS.tests.base import create_browser, animation_is_finished from django.conf import settings import sys - - -class IcalTest(LiveServerTestCase): - def setUp(self): - self.all_events = set(range(1, 18)) - self.current_events = (1, 2, 3, 6, 7, 8, 10, 11, 12, 14, 15, 16, 18) - self.not_current_events = set(self.all_events) - set(self.current_events) - - self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1') - self.profile = models.Profile( - username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True) - self.profile.set_password("EventTestPassword") - self.profile.save() - - # produce 7 normal events - 5 current - 1 last week - 1 two years ago - 2 provisional - 2 confirmed - 3 booked - models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, - start_date=date.today() + timedelta(days=6), description="start future no end") - models.Event.objects.create(name="TE E2", status=models.Event.PROVISIONAL, start_date=date.today(), - description="start today no end") - models.Event.objects.create(name="TE E3", status=models.Event.CONFIRMED, start_date=date.today(), - end_date=date.today(), description="start today with end today") - models.Event.objects.create(name="TE E4", status=models.Event.CONFIRMED, - start_date=date.today() - timedelta(weeks=104), - description="start past 2 years no end") - models.Event.objects.create(name="TE E5", status=models.Event.BOOKED, - start_date=date.today() - timedelta(days=7), - end_date=date.today() - timedelta(days=1), - description="start past 1 week with end past") - models.Event.objects.create(name="TE E6", status=models.Event.BOOKED, - start_date=date.today() - timedelta(days=2), - start_time=time(8, 00), - end_date=date.today() + timedelta(days=2), - end_time=time(23, 00), description="start past, end future") - models.Event.objects.create(name="TE E7", status=models.Event.BOOKED, - start_date=date.today() + timedelta(days=2), - end_date=date.today() + timedelta(days=2), description="start + end in future") - - # 2 cancelled - 1 current - models.Event.objects.create(name="TE E8", start_date=date.today() + timedelta(days=2), - end_date=date.today() + timedelta(days=2), status=models.Event.CANCELLED, - description="cancelled in future") - models.Event.objects.create(name="TE E9", start_date=date.today() - timedelta(days=1), - end_date=date.today() + timedelta(days=2), status=models.Event.CANCELLED, - description="cancelled and started") - - # 5 dry hire - 3 current - 1 cancelled - models.Event.objects.create(name="TE E10", start_date=date.today(), dry_hire=True, description="dryhire today") - models.Event.objects.create(name="TE E11", start_date=date.today(), dry_hire=True, checked_in_by=self.profile, - description="dryhire today, checked in") - models.Event.objects.create(name="TE E12", start_date=date.today() - timedelta(days=1), dry_hire=True, - status=models.Event.BOOKED, description="dryhire past") - models.Event.objects.create(name="TE E13", start_date=date.today() - timedelta(days=2), dry_hire=True, - checked_in_by=self.profile, description="dryhire past checked in") - models.Event.objects.create(name="TE E14", start_date=date.today(), dry_hire=True, - status=models.Event.CANCELLED, description="dryhire today cancelled") - - # 4 non rig - 3 current - models.Event.objects.create(name="TE E15", start_date=date.today(), is_rig=False, description="non rig today") - models.Event.objects.create(name="TE E16", start_date=date.today() + timedelta(days=1), is_rig=False, - description="non rig tomorrow") - models.Event.objects.create(name="TE E17", start_date=date.today() - timedelta(days=1), is_rig=False, - description="non rig yesterday") - models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False, status=models.Event.CANCELLED, - description="non rig today cancelled") - - self.browser = create_browser() - self.browser.implicitly_wait(3) # Set implicit wait session wide - os.environ['RECAPTCHA_TESTING'] = 'True' - - def tearDown(self): - self.browser.quit() - os.environ['RECAPTCHA_TESTING'] = 'False' - - def authenticate(self, n=None): - self.assertIn( - self.live_server_url + '/user/login/', self.browser.current_url) - if n: - self.assertIn('?next=%s' % n, self.browser.current_url) - username = self.browser.find_element_by_id('id_username') - password = self.browser.find_element_by_id('id_password') - submit = self.browser.find_element_by_css_selector( - 'input[type=submit]') - - username.send_keys("EventTest") - password.send_keys("EventTestPassword") - submit.click() - - self.assertEqual(self.live_server_url + n, self.browser.current_url) - - def testApiKeyGeneration(self): - # Requests address - self.browser.get(self.live_server_url + '/user/') - # Gets redirected to login - self.authenticate('/user/') - - # Completes and comes back to /user/ - # Checks that no api key is displayed - self.assertEqual("No API Key Generated", - self.browser.find_element_by_xpath("//div[@id='content']/div/div/div[3]/dl[2]/dd").text) - self.assertEqual("No API Key Generated", self.browser.find_element_by_css_selector("pre").text) - - # Now creates an API key, and check a URL is displayed one - self.browser.find_element_by_link_text("Generate API Key").click() - self.assertIn("rigs.ics", self.browser.find_element_by_id("cal-url").text) - self.assertNotIn("?", self.browser.find_element_by_id("cal-url").text) - - # Lets change everything so it's not the default value - self.browser.find_element_by_xpath("//input[@value='rig']").click() - self.browser.find_element_by_xpath("//input[@value='non-rig']").click() - self.browser.find_element_by_xpath("//input[@value='dry-hire']").click() - self.browser.find_element_by_xpath("//input[@value='cancelled']").click() - self.browser.find_element_by_xpath("//input[@value='provisional']").click() - self.browser.find_element_by_xpath("//input[@value='confirmed']").click() - - # and then check the url is correct - self.assertIn( - "rigs.ics?rig=false&non-rig=false&dry-hire=false&cancelled=true&provisional=false&confirmed=false", - self.browser.find_element_by_id("cal-url").text) - - # Awesome - all seems to work - - def testICSFiles(self): - specialEvent = models.Event.objects.get(name="TE E6") - - # Requests address - self.browser.get(self.live_server_url + '/user/') - # Gets redirected to login - self.authenticate('/user/') - - # Now creates an API key, and check a URL is displayed one - self.browser.find_element_by_link_text("Generate API Key").click() - - c = Client() - - # Default settings - should have all non-cancelled events - # Get the ical file (can't do this in selanium because reasons) - icalUrl = self.browser.find_element_by_id("cal-url").text - response = c.get(icalUrl) - self.assertEqual(200, response.status_code) - - # content = response.content.decode('utf-8') - - # Check has entire file - self.assertContains(response, "BEGIN:VCALENDAR") - self.assertContains(response, "END:VCALENDAR") - - expectedIn = [1, 2, 3, 5, 6, 7, 10, 11, 12, 13, 15, 16, 17] - for test in range(1, 18): - if test in expectedIn: - self.assertContains(response, "TE E" + str(test) + " ") - else: - self.assertNotContains(response, "TE E" + str(test) + " ") - - # Check that times have been included correctly - self.assertContains(response, - specialEvent.start_date.strftime('%Y%m%d') + 'T' + specialEvent.start_time.strftime( - '%H%M%S')) - self.assertContains(response, - specialEvent.end_date.strftime('%Y%m%d') + 'T' + specialEvent.end_time.strftime('%H%M%S')) - - # Only dry hires - self.browser.find_element_by_xpath("//input[@value='rig']").click() - self.browser.find_element_by_xpath("//input[@value='non-rig']").click() - - icalUrl = self.browser.find_element_by_id("cal-url").text - response = c.get(icalUrl) - self.assertEqual(200, response.status_code) - - expectedIn = [10, 11, 12, 13] - for test in range(1, 18): - if test in expectedIn: - self.assertContains(response, "TE E" + str(test) + " ") - else: - self.assertNotContains(response, "TE E" + str(test) + " ") - - # Only provisional rigs - self.browser.find_element_by_xpath("//input[@value='rig']").click() - self.browser.find_element_by_xpath("//input[@value='dry-hire']").click() - self.browser.find_element_by_xpath("//input[@value='confirmed']").click() - - icalUrl = self.browser.find_element_by_id("cal-url").text - response = c.get(icalUrl) - self.assertEqual(200, response.status_code) - - expectedIn = [1, 2] - for test in range(1, 18): - if test in expectedIn: - self.assertContains(response, "TE E" + str(test) + " ") - else: - self.assertNotContains(response, "TE E" + str(test) + " ") - - # Only cancelled non-rigs - self.browser.find_element_by_xpath("//input[@value='rig']").click() - self.browser.find_element_by_xpath("//input[@value='non-rig']").click() - self.browser.find_element_by_xpath("//input[@value='provisional']").click() - self.browser.find_element_by_xpath("//input[@value='cancelled']").click() - - icalUrl = self.browser.find_element_by_id("cal-url").text - response = c.get(icalUrl) - self.assertEqual(200, response.status_code) - - expectedIn = [18] - for test in range(1, 18): - if test in expectedIn: - self.assertContains(response, "TE E" + str(test) + " ") - else: - self.assertNotContains(response, "TE E" + str(test) + " ") - - # Nothing selected - self.browser.find_element_by_xpath("//input[@value='non-rig']").click() - self.browser.find_element_by_xpath("//input[@value='cancelled']").click() - - icalUrl = self.browser.find_element_by_id("cal-url").text - response = c.get(icalUrl) - self.assertEqual(200, response.status_code) - - expectedIn = [] - for test in range(1, 18): - if test in expectedIn: - self.assertContains(response, "TE E" + str(test) + " ") - else: - self.assertNotContains(response, "TE E" + str(test) + " ") - - # Wow - that was a lot of tests - + class ClientEventAuthorisationTest(TestCase): auth_data = { diff --git a/RIGS/tests/test_rigs.py b/RIGS/tests/test_rigs.py index 8f695d74..0ac1b780 100644 --- a/RIGS/tests/test_rigs.py +++ b/RIGS/tests/test_rigs.py @@ -19,6 +19,7 @@ from datetime import date, time, timedelta from django.utils import timezone from selenium.webdriver.common.action_chains import ActionChains from django.db import transaction +from django.test.client import Client class BaseRigboardTest(AutoLoginTest): @@ -26,6 +27,19 @@ class BaseRigboardTest(AutoLoginTest): self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1') super().setUp() self.client = models.Person.objects.create(name='Rigboard Test Person', email='rigboard@functional.test') + self.wait = WebDriverWait(self.driver, 5) + + def select_event_type(self, event_type): + self.wait.until(animation_is_finished()) + self.assertFalse(self.page.is_expanded) + self.page.select_event_type(event_type) + self.wait.until(animation_is_finished()) + self.assertTrue(self.page.is_expanded) + + +class TestRigboard(BaseRigboardTest): + def setUp(self): + super().setUp() self.testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, start_date=date.today() + timedelta(days=6), description="start future no end", @@ -50,19 +64,6 @@ class BaseRigboardTest(AutoLoginTest): quantity="3", order=2, ).save() - self.wait = WebDriverWait(self.driver, 5) - - def select_event_type(self, event_type): - self.wait.until(animation_is_finished()) - self.assertFalse(self.page.is_expanded) - self.page.select_event_type(event_type) - self.wait.until(animation_is_finished()) - self.assertTrue(self.page.is_expanded) - - -class TestRigboard(BaseRigboardTest): - def setUp(self): - super().setUp() self.testEvent2 = models.Event.objects.create(name="TE E2", status=models.Event.PROVISIONAL, start_date=date.today() + timedelta(days=8), description="start future no end, later", @@ -318,6 +319,30 @@ class TestEventCreate(BaseRigboardTest): class TestEventDuplicate(BaseRigboardTest): def setUp(self): super().setUp() + self.testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, + start_date=date.today() + timedelta(days=6), + description="start future no end", + purchase_order='TESTPO', + person=self.client, + auth_request_by=self.profile, + auth_request_at=base.create_datetime(2015, 0o6, 0o4, 10, 00), + auth_request_to="some@email.address") + + item1 = models.EventItem( + event=self.testEvent, + name="Test Item 1", + cost="10.00", + quantity="1", + order=1 + ).save() + item2 = models.EventItem( + event=self.testEvent, + name="Test Item 2", + description="Foo", + cost="9.72", + quantity="3", + order=2, + ).save() self.page = pages.DuplicateEvent(self.driver, self.live_server_url, event_id=self.testEvent.pk).open() def test_rig_duplicate(self): @@ -394,6 +419,30 @@ class TestEventDuplicate(BaseRigboardTest): class TestEventEdit(BaseRigboardTest): def setUp(self): super().setUp() + self.testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, + start_date=date.today() + timedelta(days=6), + description="start future no end", + purchase_order='TESTPO', + person=self.client, + auth_request_by=self.profile, + auth_request_at=base.create_datetime(2015, 0o6, 0o4, 10, 00), + auth_request_to="some@email.address") + + item1 = models.EventItem( + event=self.testEvent, + name="Test Item 1", + cost="10.00", + quantity="1", + order=1 + ).save() + item2 = models.EventItem( + event=self.testEvent, + name="Test Item 2", + description="Foo", + cost="9.72", + quantity="3", + order=2, + ).save() self.page = pages.EditEvent(self.driver, self.live_server_url, event_id=self.testEvent.pk).open() def test_rig_edit(self): @@ -429,6 +478,30 @@ class TestEventEdit(BaseRigboardTest): class TestEventDetail(BaseRigboardTest): def setUp(self): super().setUp() + self.testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, + start_date=date.today() + timedelta(days=6), + description="start future no end", + purchase_order='TESTPO', + person=self.client, + auth_request_by=self.profile, + auth_request_at=base.create_datetime(2015, 0o6, 0o4, 10, 00), + auth_request_to="some@email.address") + + item1 = models.EventItem( + event=self.testEvent, + name="Test Item 1", + cost="10.00", + quantity="1", + order=1 + ).save() + item2 = models.EventItem( + event=self.testEvent, + name="Test Item 2", + description="Foo", + cost="9.72", + quantity="3", + order=2, + ).save() self.page = pages.EventDetail(self.driver, self.live_server_url, event_id=self.testEvent.pk).open() def test_rig_detail(self): @@ -436,3 +509,188 @@ class TestEventDetail(BaseRigboardTest): self.assertEqual(person.name, self.page.name) self.assertEqual(person.email, self.page.email) self.assertEqual(person.phone, self.page.phone) + + +class TestCalendar(BaseRigboardTest): + def setUp(self): + super().setUp() + self.all_events = set(range(1, 18)) + self.current_events = (1, 2, 3, 6, 7, 8, 10, 11, 12, 14, 15, 16, 18) + self.not_current_events = set(self.all_events) - set(self.current_events) + + # produce 7 normal events - 5 current - 1 last week - 1 two years ago - 2 provisional - 2 confirmed - 3 booked + models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, + start_date=date.today() + timedelta(days=6), description="start future no end") + models.Event.objects.create(name="TE E2", status=models.Event.PROVISIONAL, start_date=date.today(), + description="start today no end") + models.Event.objects.create(name="TE E3", status=models.Event.CONFIRMED, start_date=date.today(), + end_date=date.today(), description="start today with end today") + models.Event.objects.create(name="TE E4", status=models.Event.CONFIRMED, + start_date=date.today() - timedelta(weeks=104), + description="start past 2 years no end") + models.Event.objects.create(name="TE E5", status=models.Event.BOOKED, + start_date=date.today() - timedelta(days=7), + end_date=date.today() - timedelta(days=1), + description="start past 1 week with end past") + models.Event.objects.create(name="TE E6", status=models.Event.BOOKED, + start_date=date.today() - timedelta(days=2), + start_time=time(8, 00), + end_date=date.today() + timedelta(days=2), + end_time=time(23, 00), description="start past, end future") + models.Event.objects.create(name="TE E7", status=models.Event.BOOKED, + start_date=date.today() + timedelta(days=2), + end_date=date.today() + timedelta(days=2), description="start + end in future") + + # 2 cancelled - 1 current + models.Event.objects.create(name="TE E8", start_date=date.today() + timedelta(days=2), + end_date=date.today() + timedelta(days=2), status=models.Event.CANCELLED, + description="cancelled in future") + models.Event.objects.create(name="TE E9", start_date=date.today() - timedelta(days=1), + end_date=date.today() + timedelta(days=2), status=models.Event.CANCELLED, + description="cancelled and started") + + # 5 dry hire - 3 current - 1 cancelled + models.Event.objects.create(name="TE E10", start_date=date.today(), dry_hire=True, description="dryhire today") + models.Event.objects.create(name="TE E11", start_date=date.today(), dry_hire=True, checked_in_by=self.profile, + description="dryhire today, checked in") + models.Event.objects.create(name="TE E12", start_date=date.today() - timedelta(days=1), dry_hire=True, + status=models.Event.BOOKED, description="dryhire past") + models.Event.objects.create(name="TE E13", start_date=date.today() - timedelta(days=2), dry_hire=True, + checked_in_by=self.profile, description="dryhire past checked in") + models.Event.objects.create(name="TE E14", start_date=date.today(), dry_hire=True, + status=models.Event.CANCELLED, description="dryhire today cancelled") + + # 4 non rig - 3 current + models.Event.objects.create(name="TE E15", start_date=date.today(), is_rig=False, description="non rig today") + models.Event.objects.create(name="TE E16", start_date=date.today() + timedelta(days=1), is_rig=False, + description="non rig tomorrow") + models.Event.objects.create(name="TE E17", start_date=date.today() - timedelta(days=1), is_rig=False, + description="non rig yesterday") + models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False, status=models.Event.CANCELLED, + description="non rig today cancelled") + + self.page = pages.UserPage(self.driver, self.live_server_url).open() + + def test_api_key_generation(self): + # Completes and comes back to /user/ + # Checks that no api key is displayed + self.assertEqual("No API Key Generated", self.page.api_key) + + # Now creates an API key, and check a URL is displayed one + self.page.generate_key() + self.assertIn("rigs.ics", self.page.cal_url) + self.assertNotIn("?", self.page.cal_url) + + # Lets change everything so it's not the default value + self.page.toggle_filter('rig') + self.page.toggle_filter('non-rig') + self.page.toggle_filter('dry-hire') + self.page.toggle_filter('cancelled') + self.page.toggle_filter('provisional') + self.page.toggle_filter('confirmed') + + # and then check the url is correct + self.assertIn( + "rigs.ics?rig=false&non-rig=false&dry-hire=false&cancelled=true&provisional=false&confirmed=false", + self.page.cal_url) + + # Awesome - all seems to work + + def test_ics_files(self): + specialEvent = models.Event.objects.get(name="TE E6") + + # Now creates an API key, and check a URL is displayed one + self.page.generate_key() + + c = Client() + + # Default settings - should have all non-cancelled events + # Get the ical file (can't do this in selanium because reasons) + icalUrl = self.page.cal_url + response = c.get(self.page.cal_url) + self.assertEqual(200, response.status_code) + + # content = response.content.decode('utf-8') + + # Check has entire file + self.assertContains(response, "BEGIN:VCALENDAR") + self.assertContains(response, "END:VCALENDAR") + + expectedIn = [1, 2, 3, 5, 6, 7, 10, 11, 12, 13, 15, 16, 17] + for test in range(1, 18): + if test in expectedIn: + self.assertContains(response, "TE E" + str(test) + " ") + else: + self.assertNotContains(response, "TE E" + str(test) + " ") + + # Check that times have been included correctly + self.assertContains(response, + specialEvent.start_date.strftime('%Y%m%d') + 'T' + specialEvent.start_time.strftime( + '%H%M%S')) + self.assertContains(response, + specialEvent.end_date.strftime('%Y%m%d') + 'T' + specialEvent.end_time.strftime('%H%M%S')) + + # Only non rigs + self.page.toggle_filter('rig') + self.page.toggle_filter('non-rig') + + icalUrl = self.page.cal_url + response = c.get(icalUrl) + self.assertEqual(200, response.status_code) + + expectedIn = [10, 11, 12, 13] + for test in range(1, 18): + if test in expectedIn: + self.assertContains(response, "TE E" + str(test) + " ") + else: + self.assertNotContains(response, "TE E" + str(test) + " ") + + # Only provisional rigs + self.page.toggle_filter('rig') + self.page.toggle_filter('dry-hire') + self.page.toggle_filter('confirmed') + + icalUrl = self.page.cal_url + response = c.get(icalUrl) + self.assertEqual(200, response.status_code) + + expectedIn = [1, 2] + for test in range(1, 18): + if test in expectedIn: + self.assertContains(response, "TE E" + str(test) + " ") + else: + self.assertNotContains(response, "TE E" + str(test) + " ") + + # Only cancelled non-rigs + self.page.toggle_filter('rig') + self.page.toggle_filter('non-rig') + self.page.toggle_filter('provisional') + self.page.toggle_filter('cancelled') + + icalUrl = self.page.cal_url + response = c.get(icalUrl) + self.assertEqual(200, response.status_code) + + expectedIn = [18] + for test in range(1, 18): + if test in expectedIn: + self.assertContains(response, "TE E" + str(test) + " ") + else: + self.assertNotContains(response, "TE E" + str(test) + " ") + + # Nothing selected + self.page.toggle_filter('non-rig') + self.page.toggle_filter('cancelled') + + icalUrl = self.page.cal_url + response = c.get(icalUrl) + self.assertEqual(200, response.status_code) + + expectedIn = [] + for test in range(1, 18): + if test in expectedIn: + self.assertContains(response, "TE E" + str(test) + " ") + else: + self.assertNotContains(response, "TE E" + str(test) + " ") + + # Wow - that was a lot of tests diff --git a/users/templates/profile_detail.html b/users/templates/profile_detail.html index df9ebdef..f8515cec 100644 --- a/users/templates/profile_detail.html +++ b/users/templates/profile_detail.html @@ -104,8 +104,8 @@
Calendar Options
-
-
+ +