Skip to content
Snippets Groups Projects
Commit 859ca094 authored by Laurent's avatar Laurent
Browse files

Merge branch 'dev#44520_bonus_recette_fiche_bibliotheque_afficher_la_boite_fonds' into 'master'

Dev#44520 bonus recette fiche bibliotheque afficher la boite fonds

See merge request !1710
parents 181483da e5ac35c5
Branches
Tags
No related merge requests found
- ticket #44520 : Fiche bibliothèque, afficher la boite fonds
\ No newline at end of file
......@@ -261,6 +261,7 @@ class Class_Bib extends Storm_Model_Abstract {
'ville' => '',
'adresse' => '',
'mail' => '',
'fond' => '',
'telephone' => '',
'aff_zone' => '',
'interdire_resa' => 0,
......
......@@ -47,6 +47,7 @@ class ZendAfi_View_Helper_BibView extends ZendAfi_View_Helper_BaseHelper {
$this->_('Contact'),
'library_location').
$this->_renderBlockHoraire() .
$this->_renderBlockFond().
$this->_renderBlockDescription().
$this->_renderBlockASavoir().
$this->_renderBlockAnnexe().
......@@ -89,6 +90,15 @@ class ZendAfi_View_Helper_BibView extends ZendAfi_View_Helper_BaseHelper {
$this->bib->hasProcure());
}
protected function _renderBlockFond() {
return $this->_renderBlock($this->_tag('dd',$this->bib->getFond()),
$this->_('Fonds'),
'library_fonds',
$this->bib->hasFond());
}
protected function _renderBlockASavoir() {
return $this
->_renderBlock($this->_renderInscription() . $this->_renderPret(),
......
......@@ -42,7 +42,8 @@ abstract class BibControllerWithZoneTestCase extends AbstractControllerTestCase
'telephone' => '04 50 51 32 12',
'adresse' => '1 rue Jean Jaures',
'photo' => '/userfiles/photobib/photobib4.jpg',
'visibilite' => Class_Bib::V_DATA]);
'visibilite' => Class_Bib::V_DATA,
'fond' => 'Tous les documents']);
$this->bib_nozone = $this->fixture('Class_Bib', ['id' => 22,
'id_zone' => 100,
......@@ -390,6 +391,13 @@ class BibControllerBibViewAnnecyTest extends BibControllerBibViewTestCase {
}
/** @test */
public function fondsShouldDisplayTousLesDocuments() {
$this->assertXPathContentContains('//div[@class="library_fonds library_box"]/dl[preceding-sibling::h2[text()="Fonds"]]/dd',
'Tous les documents');
}
/** @test */
public function adresseShouldBe1RueJeanJaures() {
$this->assertXPathContentContains('//dd', '1 rue Jean Jaures');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment