Skip to content
Snippets Groups Projects
Commit 554e536d authored by Patrick Barroca's avatar Patrick Barroca
Browse files

rel #14885 : subModal fixes and renew action is officially a popup action

parent 772998cd
Branches
Tags
3 merge requests!529Hotline 6.56,!420Dev #14885 renew result in modal popup,!405Dev #14885 renew result in modal popup
Hide whitespace changes
Inline Side-by-side
application/modules/opac/controllers/AbonneController.php
+ 13
− 5
View file @ 554e536d
...@@ -388,17 +388,25 @@ class AbonneController extends ZendAfi_Controller_Action { ...@@ -388,17 +388,25 @@ class AbonneController extends ZendAfi_Controller_Action {
public function prolongerpretAction() { public function prolongerpretAction() {
$id_pret = $this->_request->getParam('id_pret'); $id_pret = $this->_getParam('id_pret');
$cls_comm = new Class_CommSigb(); $cls_comm = new Class_CommSigb();
$result = $cls_comm->prolongerPret($this->_user, $id_pret); $result = $cls_comm->prolongerPret($this->_user, $id_pret);
$this->view->fiche = $this->_user->getFicheSigb(); $this->view->fiche = $this->_user->getFicheSigb();
$this->_helper->notify($result['statut'] == 1
? $this->_('Prêt prolongé')
: $result['erreur']);
$this->_redirect('/opac/abonne/prets'); $this->view->titre = $result['statut'] == 1
? $this->_('Prêt prolongé')
: $this->_('Erreur');
$this->view->message = $result['statut'] == 1
? $this->_('Votre prêt a bien été prolongé.')
: $result['erreur'];
$this->renderPopupResult($this->view->titre,
$this->view->render('abonne/prolonger-pret.phtml'),
['show_modal' => 'true',
'position' => json_decode('{ "my": "center center", "at": "center center"}')]);
} }
......
application/modules/opac/views/scripts/abonne/prets.phtml
+ 39
− 38
View file @ 554e536d
...@@ -3,58 +3,59 @@ ...@@ -3,58 +3,59 @@
<?php <?php
// messages // messages
foreach (['message', 'error'] as $type) foreach (['message', 'error'] as $type)
if (isset($this->fiche[$type]) && $this->fiche[$type]) if (isset($this->fiche[$type]) && $this->fiche[$type])
echo '<p class="error">' . $this->fiche[$type] . '</p>'; echo '<p class="error">' . $this->fiche[$type] . '</p>';
?> ?>
<?php if (isset($this->fiche['fiche']) <?php if (isset($this->fiche['fiche'])
&& ($emprunts = $this->fiche['fiche']->getEmprunts()) && ($emprunts = $this->fiche['fiche']->getEmprunts())
&& !empty($emprunts)) { && !empty($emprunts)) {
echo $this->abonne_LoanExport(); echo $this->abonne_LoanExport();
} }
?> ?>
<table width="100%" class="tablesorter"> <table width="100%" class="tablesorter">
<thead> <thead>
<tr> <tr>
<th style="text-align:left; white-space:nowrap"><?php echo $this->_('n°'); ?></th> <th style="text-align:left; white-space:nowrap"><?php echo $this->_('n°'); ?></th>
<th style="text-align:left"><?php echo $this->_('Titre'); ?></th> <th style="text-align:left"><?php echo $this->_('Titre'); ?></th>
<th style="text-align:left"><?php echo $this->_('Auteur'); ?></th> <th style="text-align:left"><?php echo $this->_('Auteur'); ?></th>
<th style="text-align:left"><?php echo $this->_('Bibliothèque'); ?></th> <th style="text-align:left"><?php echo $this->_('Bibliothèque'); ?></th>
<th style="text-align:center"><?php echo $this->_('Retour prévu'); ?></th> <th style="text-align:center"><?php echo $this->_('Retour prévu'); ?></th>
<th style="text-align:center"><?php echo $this->_('Informations'); ?></th> <th style="text-align:center"><?php echo $this->_('Informations'); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
$num = 1; $num = 1;
if (isset($this->fiche['fiche'])) { if (isset($this->fiche['fiche'])) {
foreach ($this->fiche["fiche"]->getEmprunts() as $emprunt) { foreach ($this->fiche["fiche"]->getEmprunts() as $emprunt) {
$class_retard = $emprunt->enRetard() ? 'class="pret_en_retard"' : '';?> $class_retard = $emprunt->enRetard() ? 'class="pret_en_retard"' : '';?>
<tr <?php echo $class_retard;?>> <tr <?php echo $class_retard;?>>
<td width="15px" align="center"><b><?php echo $num++;?></b></td> <td width="15px" align="center"><b><?php echo $num++;?></b></td>
<td> <td>
<?php <?php
echo $this->tagAnchor( echo $this->tagAnchor(
$this->url(['controller' => 'recherche', $this->url(['controller' => 'recherche',
'action' => 'viewnotice', 'action' => 'viewnotice',
'id' => $emprunt->getNoticeOPACId(), 'id' => $emprunt->getNoticeOPACId(),
'retour_abonne' => 'prets'], 'retour_abonne' => 'prets'],
null, true), null, true),
$emprunt->getTitre()); $emprunt->getTitre());
?></td> ?></td>
<td><?php echo $emprunt->getAuteur();?></td> <td><?php echo $emprunt->getAuteur();?></td>
<td><?php echo $emprunt->getBibliotheque();?></td> <td><?php echo $emprunt->getBibliotheque();?></td>
<td class="date_retour"> <td class="date_retour">
<?php echo $emprunt->getDateRetour() . ' ';?> <?php echo $emprunt->getDateRetour() . ' ';?>
<?php <?php
if ($emprunt->isRenewable()) if ($emprunt->isRenewable())
echo $this->tagAnchor($this->url(['action' => 'prolongerPret', echo $this->tagAnchor($this->url(['action' => 'prolongerPret',
'id_pret' => $emprunt->getId()]), 'id_pret' => $emprunt->getId()]),
$this->_('Prolonger'));?> $this->_('Prolonger'),
</td> ['data-popup' => 'true']);?>
<td><?php echo $emprunt->getType();?></td> </td>
</tr> <td><?php echo $emprunt->getType();?></td>
</tr>
<?php } <?php }
} ?> } ?>
</tbody> </tbody>
......
public/opac/js/subModal.js
+ 11
− 9
View file @ 554e536d
...@@ -139,24 +139,26 @@ ...@@ -139,24 +139,26 @@
if (data['show_modal'] && data['show_modal']=='true') if (data['show_modal'] && data['show_modal']=='true')
show_modal=true; show_modal=true;
var position = { my: "center top", at: "center top", of: window }; var position = (data['position'] != undefined) ?
data['position'] :
{ my: "center top", at: "center top", of: window };
//pour que le dialogue soit en dessous de la notification //pour que le dialogue soit en dessous de la notification
if ($("#info_message").size()) if ($("#info_message").size())
position = {my: "center top", position = {my: "center top",
at: "center bottom", at: "center bottom",
of: "#info_message", of: "#info_message",
collision: "flip"}; collision: "flip"};
var modal = container.dialog({ var modal = container.dialog({
width:modal_size['width'], width:modal_size['width'],
height:modal_size['height'], height:modal_size['height'],
modal:false, modal:show_modal,
title: titre, title: titre,
dialogClass: dialogClass, dialogClass: dialogClass,
close:onClose, close:onClose,
open:onOpen, open:onOpen,
position: position position: position
}); });
return modal; return modal;
} }
......
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