From f83c91e310890887a487f586165e772b3d5eafd0 Mon Sep 17 00:00:00 2001
From: llaffont <laurent.laffont@gmail.com>
Date: Tue, 21 Jan 2014 17:19:00 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20rendu=20des=20jours=20o=C3=B9=20il?=
=?UTF-8?q?=20y=20a=20un=20=C3=A9v=C3=A9nement=20sur=20le=20calendrier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ZendAfi/View/Helper/Calendar/Table.php | 2 +-
.../View/Helper/Accueil/CalendarTest.php | 20 ++++++++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Calendar/Table.php b/library/ZendAfi/View/Helper/Calendar/Table.php
index f9e946bcd75..91ded5bd57b 100644
--- a/library/ZendAfi/View/Helper/Calendar/Table.php
+++ b/library/ZendAfi/View/Helper/Calendar/Table.php
@@ -220,7 +220,7 @@ class ZendAfi_View_Helper_Calendar_Table extends Zend_View_Helper_HtmlElement {
foreach($events as $event) {
$event_debut = strtotime($event->getEventsDebut());
$event_fin = strtotime($event->getEventsFin());
- $jour_debut = (int)date('y', $event_debut);
+ $jour_debut = (int)date('j', $event_debut);
$mois_debut = (int)date('m', $event_debut);
$jour_fin = (int)date('j', $event_fin);
diff --git a/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php b/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php
index 70fcd8ef44e..ffe02089d32 100644
--- a/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php
+++ b/tests/library/ZendAfi/View/Helper/Accueil/CalendarTest.php
@@ -89,7 +89,7 @@ abstract class CalendarWithEmptyPreferencesTestCase extends CalendarViewHelperTe
ZendAfi_View_Helper_CalendarContent::setTimeSource($time_source);
$this->nanook2
- ->setEventsDebut('2013-08-01')
+ ->setEventsDebut('2013-08-17')
->setEventsFin('2013-08-19');
@@ -221,6 +221,24 @@ class CalendarViewTodayWithEmptyPreferencesTest extends CalendarViewTodayTestCas
}
+ /** @test */
+ function dayThirteenShouldNotHaveClassClickable() {
+ $this->assertNotXPathContentContains($this->html,
+ '//a[contains(@class, "day_clickable")]',
+ '13',
+ $this->html);
+ }
+
+
+ /** @test */
+ function daySeventeenShouldHaveClassDayClickable() {
+ $this->assertXPathContentContains($this->html,
+ '//a[contains(@class, "day_clickable")]',
+ '17',
+ $this->html);
+ }
+
+
/** @test */
function calendarEventListShouldContainsCategorieEvenements() {
$this->assertXPathContentContains($this->html,
--
GitLab