dev #48981 multi cards: update loans and holds widget

library/ZendAfi/View/Helper/Accueil/Prets.php

@@ -25,7 +25,7 @@ class ZendAfi_View_Helper_Accueil_Prets extends ZendAfi_View_Helper_Accueil_Abon
   protected $_boite_id = 'prets';
 
   public function getModels() {
-    return $this->_abonne->getEmprunts();
+    return (new Class_User_Cards($this->_abonne))->getLoans();
   }
 
 

library/ZendAfi/View/Helper/Accueil/Reservations.php

@@ -22,11 +22,6 @@ class ZendAfi_View_Helper_Accueil_Reservations extends ZendAfi_View_Helper_Accue
   protected $_titre_action = 'reservations';
   protected $_boite_id = 'reservations';
 
-  public function getModels() {
-    return $this->_abonne->getReservations();
-  }
-
-
   public function renderElement($title, $status, $notice) {
     return $this->view->tag('li', '[' . $status . '] ' .
                             $this->view->tagAnchor($this->view->urlNotice($notice), $title));
@@ -60,7 +55,7 @@ class ZendAfi_View_Helper_Accueil_Reservations extends ZendAfi_View_Helper_Accue
 
   public function getContenu() {
     return
-      $this->renderModelReservations($this->_abonne->getReservations()) .
+      $this->renderModelReservations((new Class_User_Cards($this->_abonne))->getHolds()) .
       $this->renderModelConsultations($this->_abonne->getConsultations());
   }
 }

tests/library/ZendAfi/View/Helper/Accueil/ReservationsTest.php

@@ -16,12 +16,12 @@
  *
  * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
  * along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 require_once 'library/ZendAfi/View/Helper/ViewHelperTestCase.php';
 
 
-class ReservationsTestWithConnectedUser extends ViewHelperTestCase {  
+class ReservationsTestWithConnectedUser extends ViewHelperTestCase {
   public function setUp() {
     parent::setUp();
 
@@ -29,7 +29,7 @@ class ReservationsTestWithConnectedUser extends ViewHelperTestCase {
       'type_module'=>'RESERVATIONS',
       'division' => '1',
       'preferences' => ['titre' => 'Mes reservations']]);
-    
+
     $helper->setView(new ZendAfi_Controller_Action_Helper_View());
     $propaganda = new Class_WebService_SIGB_Reservation('13', new Class_WebService_SIGB_Exemplaire(456));
     $propaganda->getExemplaire()
@@ -53,14 +53,14 @@ class ReservationsTestWithConnectedUser extends ViewHelperTestCase {
     $emprunteur->reservationsAddAll(array( $propaganda,$en_suivant_emma));
     $this->html = $helper->getBoite();
   }
-  
+
 
   /** @test  */
   public function h1ShouldContainsMesReservations () {
     $this->assertXPathContentContains($this->html,'//h1','Mes reservations');
   }
 
-  
+
   /** @test */
   public function listShouldDisplayPropagandaNotice() {
     $this->assertXPathContentContains($this->html,'//ul//li','Propaganda');
@@ -89,12 +89,12 @@ class ReservationsTestWithConnectedUser extends ViewHelperTestCase {
   public function titleShouldBeLinkedToAbonneReservations () {
     $this->assertXPath($this->html,'//h1//a[contains(@href,"/abonne/reservations")]',$this->html);
   }
-  
-
 }
 
 
-class ReservationsTestWithNonConnectedUser extends ViewHelperTestCase { 
+
+
+class ReservationsTestWithNonConnectedUser extends ViewHelperTestCase {
   public function setUp() {
     parent::setUp();
 
@@ -106,7 +106,7 @@ class ReservationsTestWithNonConnectedUser extends ViewHelperTestCase {
     $this->helper->setView(new ZendAfi_Controller_Action_Helper_View());
     $this->html = $this->helper->getBoite();
   }
-  
+
 
   /** @test */
   public function boiteReservationsShouldNotBeDisplayed () {

tests/scenarios/MultiCards/MultiCardsTest.php

@@ -466,9 +466,16 @@ class Scenario_AbonneMultiCardsAccountOfEwokFicheActionTest
   public function setUp() {
     parent::setUp();
 
-    $cfg_accueil = ['modules' => ['1' => ['division' => '4',
-                                          'type_module' => 'LOGIN',
-                                          'preferences' => []]]];
+    $cfg_accueil = ['modules' => [
+                                  ['division' => 4,
+                                   'type_module' => 'LOGIN',
+                                   'preferences' => []],
+                                  ['division' => 1,
+                                   'type_module' => 'RESERVATIONS',
+                                   'preferences' => []],
+                                  ['division' => 1,
+                                   'type_module' => 'PRETS',
+                                   'preferences' => []]]];
     Class_Profil::getCurrentProfil()
       ->setCfgAccueil($cfg_accueil)
       ->assertSave();
@@ -484,6 +491,21 @@ class Scenario_AbonneMultiCardsAccountOfEwokFicheActionTest
   }
 
 
+  /** @test */
+  public function loansWidgetShouldContainsUlLiWithPotter() {
+    $this->assertXPathContentContains('//div[@class="boite prets"]//ul//li',
+                                      'Potter');
+  }
+
+
+  /** @test */
+  public function holdsWidgetShouldContainsUlLiWithArcadia() {
+    $this->assertXPathContentContains('//div[@class="boite reservations"]//ul//li',
+                                      'Arcadia',
+                                      $this->_response->getBody());
+  }
+
+
   /** @test */
   public function loginWidgetShouldContainsYouHaveOneHold() {
     $this->assertXPathContentContains('//div[@id="boite_login"]//a[@class="account-booking"]',