Merge branch 'hotline#46113_gestion_des_horaires_bibliotheque' into 'hotline-master'

hotline #46613 Library openings: handles exceptionnal closures in real time display

See merge request !1757

VERSIONS_HOTLINE/46113

+ - ticket #46113 : ouverture des bibliothèques: prise en compte des fermetures exceptionnelles dans l'affichage temps réel
\ No newline at end of file

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;
     }
 

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'));
+  }
+
 }