diff --git a/application/modules/telephone/views/scripts/abonne/fiche.phtml b/application/modules/telephone/views/scripts/abonne/fiche.phtml index edeb871e1d2402cf4f19c94d93fc062a8e92278a..02dda2517ce3715b8fa35a5489eb440f1223d25d 100644 --- a/application/modules/telephone/views/scripts/abonne/fiche.phtml +++ b/application/modules/telephone/views/scripts/abonne/fiche.phtml @@ -2,104 +2,102 @@ <?php echo $this->partial('abonne/identity.phtml', array('user' => $this->user));?> <?php if ($this->messages) { ?> - <div data-role="navbar" data-iconpos="left"> - <ul> - <?php foreach($this->messages as $message) { ?> - <li><a href="#" data-icon="info" data-theme="a"><?php echo $this->escape($message);?></a></li> - <?php } ?> - </ul> - </div> +<div data-role="navbar" data-iconpos="left"> + <ul> + <?php foreach($this->messages as $message) { ?> + <li><a href="#" data-icon="info" data-theme="a"><?php echo $this->escape($message);?></a></li> + <?php } ?> + </ul> +</div> <?php } ?> <?php -if ($this->user->isAbonne()) { - $date_fin = formatDate($this->user->getDateFin(), '1'); - $message = ($this->user->isAbonnementValid()) ? - "Votre abonnement est valide jusqu'au %s." : - "Votre abonnement est terminé depuis le %s."; + if ($this->user->isAbonne()) { +$date_fin = formatDate($this->user->getDateFin(), '1'); +$message = ($this->user->isAbonnementValid()) ? +"Votre abonnement est valide jusqu'au %s." : +"Votre abonnement est terminé depuis le %s."; ?> - <ul data-role="listview"> - <li data-role="list-divider"><?php echo $this->_('Abonnement');?></li> - <li><?php echo $this->_($message, $date_fin);?></li> - </ul> +<ul data-role="listview"> + <li data-role="list-divider"><?php echo $this->_('Abonnement');?></li> + <li><?php echo $this->_($message, $date_fin);?></li> +</ul> <?php } ?> <?php -$fiche_sigb = $this->user->getFicheSigb(); + $fiche_sigb = $this->user->getFicheSigb(); if (array_key_exists("erreur", $fiche_sigb)) { ?> - <div data-role="navbar" data-iconpos="left"> - <ul> - <li><a href="#" data-icon="alert" data-theme="a"><?php echo $this->escape($fiche_sigb["erreur"]);?></a></li> - </ul> - </div> +<div data-role="navbar" data-iconpos="left"> + <ul> + <li><a href="#" data-icon="alert" data-theme="a"><?php echo $this->escape($fiche_sigb["erreur"]);?></a></li> + </ul> +</div> <?php } ?> <?php if (array_key_exists("message", $fiche_sigb)) { ?> - <div data-role="navbar" data-iconpos="left"> - <ul> - <li><a href="#" data-icon="info" data-theme="a"><?php echo $this->escape($fiche_sigb["message"]);?></a></li> - </ul> - </div> +<div data-role="navbar" data-iconpos="left"> + <ul> + <li><a href="#" data-icon="info" data-theme="a"><?php echo $this->escape($fiche_sigb["message"]);?></a></li> + </ul> +</div> <?php } ?> <?php -$nb_retards = $this->user->getNbEmpruntsRetard(); + $nb_retards = $this->user->getNbEmpruntsRetard(); $nb_prets = $this->user->getNbEmprunts(); $nb_resas = $this->user->getNbReservations(); ?> <ul data-role="listview" data-split-icon="forward"> - <li data-role="list-divider"><?php echo $this->_('Prêts');?> - <span class="ui-li-count"><?php echo $nb_prets;?></span></li> - <?php if (0 < $nb_prets) { ?> - <?php foreach($this->user->getEmprunts() as $emprunt) { - $class_retard = $emprunt->enRetard() ? 'pret_en_retard"' : '';?> - <li data-icon="false"> - <a <?php echo $emprunt->enRetard() ? 'style="color:red;"' : '';?> - href="<?php echo $this->url(array('controller' => 'recherche', - 'action' => 'viewnotice', - 'id' => $emprunt->getNoticeOPACId()));?>"> - <h3><?php echo $emprunt->getTitre();?></h3> - <p><strong><?php echo $this->escape($emprunt->getAuteur());?></strong></p> - <p><strong><?php echo $this->escape($emprunt->getBibliotheque());?></strong></p> - <p><strong><?php echo $this->_('Retour prévu');?> <?php echo $emprunt->getDateRetour();?></strong></p> - </a> - <?php if ($emprunt->isRenewable()) { ?> - <a href="<?php echo $this->url(array('action' => 'prolongerpret', - 'id_pret' => $emprunt->getId()));?>" - data-theme="c"><?php echo $this->_('Prolonger');?></a> - <?php } ?> - </li> - <?php } ?> - <?php } else { ?> - <li><?php echo $this->_('Vous n\'avez aucun prêt en cours');?></li> - <?php } ?> + <li data-role="list-divider"><?php echo $this->_('Prêts');?> + <span class="ui-li-count"><?php echo $nb_prets;?></span></li> + <?php if (0 < $nb_prets) { ?> + <?php foreach($this->user->getEmprunts() as $emprunt) {?> + <li data-icon="false"<?php echo $emprunt->enRetard() ? ' class="pret_en_retard"' : '';?>> + <a href="<?php echo $this->url(array('controller' => 'recherche', + 'action' => 'viewnotice', + 'id' => $emprunt->getNoticeOPACId()));?>"> + <h3><?php echo $emprunt->getTitre();?></h3> + <p><strong><?php echo $this->escape($emprunt->getAuteur());?></strong></p> + <p><strong><?php echo $this->escape($emprunt->getBibliotheque());?></strong></p> + <p><strong><?php echo $this->_('Retour prévu');?> <?php echo $emprunt->getDateRetour();?></strong></p> + </a> + <?php if ($emprunt->isRenewable()) { ?> + <a href="<?php echo $this->url(array('action' => 'prolongerpret', + 'id_pret' => $emprunt->getId()));?>" + data-theme="c"><?php echo $this->_('Prolonger');?></a> + <?php } ?> + </li> + <?php } ?> + <?php } else { ?> + <li><?php echo $this->_('Vous n\'avez aucun prêt en cours');?></li> + <?php } ?> </ul> <ul data-role="listview" data-split-icon="delete"> - <li data-role="list-divider"><?php echo $this->_('Réservations');?> - <span class="ui-li-count"><?php echo $nb_resas;?></span></li> - <?php if (0 < $nb_resas) { ?> - <?php foreach($this->user->getReservations() as $reservation) { ?> - <li data-icon="false"> - <a href="<?php echo $this->url(array('controller' => 'recherche', - 'action' => 'viewnotice', - 'id' => $reservation->getNoticeOPACId()));?>"> - <h3><?php echo $reservation->getTitre();?></h3> - <p><strong><?php echo $this->escape($reservation->getAuteur());?></strong></p> - <p><strong><?php echo $this->escape($reservation->getBibliotheque());?></strong></p> - <p><?php echo $this->_('Etat') . ' : ' . $this->escape($reservation->getEtat());?>, - <?php echo $this->_('Rang') . ' : ' . $this->escape($reservation->getRang());?></p> - </a> - <a href="<?php echo $this->url(array('action' => 'cancel-hold', - 'id' => $reservation->getId()));?>" - data-rel="dialog" data-theme="c" data-position="notext"> - <?php echo $this->_('Supprimer cette réservation');?></a> - </li> - <?php } ?> - <?php } else { ?> - <li><?php echo $this->_('Vous n\'avez aucune réservation en cours');?></li> - <?php } ?> + <li data-role="list-divider"><?php echo $this->_('Réservations');?> + <span class="ui-li-count"><?php echo $nb_resas;?></span></li> + <?php if (0 < $nb_resas) { ?> + <?php foreach($this->user->getReservations() as $reservation) { ?> + <li data-icon="false"> + <a href="<?php echo $this->url(array('controller' => 'recherche', + 'action' => 'viewnotice', + 'id' => $reservation->getNoticeOPACId()));?>"> + <h3><?php echo $reservation->getTitre();?></h3> + <p><strong><?php echo $this->escape($reservation->getAuteur());?></strong></p> + <p><strong><?php echo $this->escape($reservation->getBibliotheque());?></strong></p> + <p><?php echo $this->_('Etat') . ' : ' . $this->escape($reservation->getEtat());?>, + <?php echo $this->_('Rang') . ' : ' . $this->escape($reservation->getRang());?></p> + </a> + <a href="<?php echo $this->url(array('action' => 'cancel-hold', + 'id' => $reservation->getId()));?>" + data-rel="dialog" data-theme="c" data-position="notext"> + <?php echo $this->_('Supprimer cette réservation');?></a> + </li> + <?php } ?> + <?php } else { ?> + <li><?php echo $this->_('Vous n\'avez aucune réservation en cours');?></li> + <?php } ?> </ul> diff --git a/public/opac/mobile/css/global.css b/public/opac/mobile/css/global.css index 31ec988be91716418fe34c80f50ffa16bce5c690..f4324894f433454e69280efcc308b2dcbd733d9e 100644 --- a/public/opac/mobile/css/global.css +++ b/public/opac/mobile/css/global.css @@ -345,6 +345,11 @@ div.bk-widget div.b-counter { } +li.pret_en_retard a { + color: red; +} + + @media only screen and (max-width : 320px) { .boite_accueil { width: 50%; diff --git a/tests/application/modules/telephone/controllers/AbonneControllerTest.php b/tests/application/modules/telephone/controllers/AbonneControllerTest.php index 2ce78cd7388b7d470d5b9aae1fe88b68bd0ca5e6..b03c288f7a109a52ee015470e96249e7a8b5913d 100644 --- a/tests/application/modules/telephone/controllers/AbonneControllerTest.php +++ b/tests/application/modules/telephone/controllers/AbonneControllerTest.php @@ -43,8 +43,19 @@ abstract class AbonneControllerTelephoneTestCase extends TelephoneAbstractContro ->setDateRetour('24/45/6789') ->setNoticeOPAC(Class_Notice::getLoader()->newInstanceWithId(46)); + $poire = Class_WebService_SIGB_Emprunt::newInstanceWithEmptyExemplaire() + ->setId(128) + ->setTitre('Poire du jardin') + ->setAuteur('Elisabeth') + ->setBibliotheque('Cran-Gevrier') + ->setDateRetour('30/01/12') + ->setNoticeOPAC(Class_Notice::getLoader()->newInstanceWithId(47)); + + $emprunteur = Class_WebService_SIGB_Emprunteur::newInstance() - ->empruntsAddAll(array($potter, $alice)) + ->empruntsAddAll([$potter, + $alice, + $poire]) ->reservationsAddAll(array(Class_WebService_SIGB_Reservation::newInstanceWithEmptyExemplaire() ->setTitre('Star Wars') @@ -90,9 +101,15 @@ class AbonneControllerTelephoneFicheTest extends AbonneControllerTelephoneTestCa } + /** @test */ + public function loanShouldBeFlaggedAsLate() { + $this->assertXPath('//li[@class="pret_en_retard"]/a'); + } + + /** @test */ public function pageShouldDisplayLoanCount() { - $this->assertXPathContentContains('//span[@class="ui-li-count"]', '2', + $this->assertXPathContentContains('//span[@class="ui-li-count"]', '3', $this->_response->getBody()); }