diff --git a/VERSIONS_HOTLINE/46113 b/VERSIONS_HOTLINE/46113 new file mode 100644 index 0000000000000000000000000000000000000000..659d555b481f791bcf9cd52dab4fb12d7a38e9f8 --- /dev/null +++ b/VERSIONS_HOTLINE/46113 @@ -0,0 +1 @@ + - ticket #46113 : ouverture des bibliothèques: prise en compte des fermetures exceptionnelles dans l'affichage temps réel \ No newline at end of file diff --git a/library/ZendAfi/View/Helper/RenderLibraryOpening.php b/library/ZendAfi/View/Helper/RenderLibraryOpening.php index cbb60c44d04086a2f86c74a87363a18a5dddd5a9..c57cba0f382c6d6942334b150891240fca13011f 100644 --- a/library/ZendAfi/View/Helper/RenderLibraryOpening.php +++ b/library/ZendAfi/View/Helper/RenderLibraryOpening.php @@ -94,7 +94,8 @@ class ZendAfi_View_Helper_RenderLibraryOpening extends ZendAfi_View_Helper_BaseH foreach (range(1, 7) as $i) { $time = strtotime('+'.$i.' day', $this->getCurrentTime()); - if ($ouverture = $this->getLibraryOuvertureOnDate($library, $time)) + if (($ouverture = $this->getLibraryOuvertureOnDate($library, $time)) + && !$ouverture->isClosure()) break; } diff --git a/tests/library/ZendAfi/View/Helper/RenderLibraryOpeningTest.php b/tests/library/ZendAfi/View/Helper/RenderLibraryOpeningTest.php index 9fc1d9c3cc9626c2401473e6a835b0abc28347dc..07982c7d7ac8fd26eff052686b5fbd2fb87a93cc 100644 --- a/tests/library/ZendAfi/View/Helper/RenderLibraryOpeningTest.php +++ b/tests/library/ZendAfi/View/Helper/RenderLibraryOpeningTest.php @@ -234,6 +234,20 @@ class ZendAfi_View_Helper_RenderLibraryOpeningOnMondayEveningTest extends ZendAf utf8_encode('Fermé depuis 18:00. Réouverture Mardi à 12:00')); } + + /** @test */ + public function withExceptionalCloseOnTuesdayMeythetShouldContainsLibraryWillOpenOnMondayAt10() { + $this->meythet->addOuverture($this->fixture('Class_Ouverture', + ['id' => 348, + 'horaires' => ['00:00', '00:00', '00:00', '00:00'], + 'jour' => '2015-10-06'])) + ->save(); + + $this->assertXPathContentContains($this->_renderOpening($this->meythet), + '//p', + utf8_encode('Fermé depuis 18:00. Réouverture Lundi à 10:00')); + } + }