diff --git a/library/Class/Avis.php b/library/Class/Avis.php
index 372e1b777da9a74cb087a0c1ca8b6f6451435687..a73ff998d04a5fbbf51757622f47ee16407bbc90 100644
--- a/library/Class/Avis.php
+++ b/library/Class/Avis.php
@@ -23,6 +23,9 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class Class_Avis extends Storm_Model_Abstract {
+ const AVIS_ABONNE = 0;
+ const AVIS_BIBLIO = 1;
+
protected $_table_name = 'cms_avis';
protected $_belongs_to = array('auteur' => array('model' => 'Class_Users',
'referenced_in' => 'id_user'),
@@ -174,21 +177,22 @@ class Class_Avis extends Storm_Model_Abstract {
function rendHtmlBlockAvis($id_news) {
- $class_user = new Class_Users();
- $user = Zend_Auth::getInstance()->getIdentity();
$info_bib = $this->rendInfoCmsAvis($id_news,1);
$info_abo = $this->rendInfoCmsAvis($id_news,0);
$sqlStmt = "Select * from cms_rank Where ID_CMS=$id_news";
- $ret = $this->sql->fetchAll($sqlStmt);
- $nb_avis = (int)$ret[0]["BIB_NOMBRE_AVIS"] + (int)$ret[0]["ABON_NOMBRE_AVIS"];
+ if (!$ret = $this->sql->fetchAll($sqlStmt))
+ $nb_avis = 0;
+ else
+ $nb_avis = (int)$ret[0]["BIB_NOMBRE_AVIS"] + (int)$ret[0]["ABON_NOMBRE_AVIS"];
+
if($nb_avis ==0) $txt_nb_avis = " Aucun avis";
else $txt_nb_avis = " Avis (".$nb_avis.")";
- $html.='<div class="avis_show_avis" onclick="showCmsAvis('.$id_news.', this)"><img src="'.URL_IMG.'bouton/plus_carre.gif" style="float:left" border="0" alt="Voir les avis" title="Voir les avis" id="plus"/> '.$txt_nb_avis.' </div>';
+ $html = '<div class="avis_show_avis" onclick="showCmsAvis('.$id_news.', this)"><img src="'.URL_IMG.'bouton/plus_carre.gif" style="float:left" border="0" alt="Voir les avis" title="Voir les avis" id="plus"/> '.$txt_nb_avis.' </div>';
$html.='<div id="avis_'.$id_news.'" style="display:none;padding-left:5px;">';
$html.='<br />';
- $html.='<a href="#" onclick="javascript:fonction_abonne(\''.$user->ID_USER.'\',\'/opac/abonne/cmsavis?id='.$id_news.'\')">» Donner ou modifier votre avis</a>';
+ $html.='<a href="#" onclick="javascript:fonction_abonne(\''.Class_Users::currentUserId().'\',\'/opac/abonne/cmsavis?id='.$id_news.'\')">» Donner ou modifier votre avis</a>';
$html.='<ul class="notice_info">';
$html.='<li>'.$info_bib["NOTE"].' <a href="#" onclick="showAvis('.$id_news.',\'bib\');return false;">Avis de bibliothécaires</a> '.$info_bib["AVIS"].'</li>';
$html.='<li>'.$info_abo["NOTE"].' <a href="#" onclick="showAvis('.$id_news.',\'abo\');return false;">Avis de lecteurs du portail</a> '.$info_abo["AVIS"].'</li>';
@@ -225,10 +229,11 @@ class Class_Avis extends Storm_Model_Abstract {
}
- public function rendInfoCmsAvis($id_news,$abon_ou_bib)
- {
+ public function rendInfoCmsAvis($id_news,$abon_ou_bib) {
$sqlStmt = "Select * from cms_rank Where ID_CMS=$id_news";
- $data = $this->sql->fetchAll($sqlStmt);
+ if (!$data = $this->sql->fetchAll($sqlStmt))
+ return array('NOTE' => 0, 'AVIS' => 0, 'ABON_NOMBRE_AVIS' => 0, 'BIB_NOMBRE_AVIS' => 0);
+
$data = $data[0];
if($abon_ou_bib == 0) {
@@ -255,77 +260,80 @@ class Class_Avis extends Storm_Model_Abstract {
return($info);
}
- // rend avis biblio par id_news
- function getCmsAvisBiblio($id_news,$statut = "")
- {
- if($statut == 1) {$sqlStmt = "Select * from cms_avis Where ID_CMS=$id_news AND ABON_OU_BIB=1 AND STATUT=1 order by DATE_AVIS DESC";}
- if($statut == 0) {$sqlStmt = "Select * from cms_avis Where ID_CMS=$id_news AND ABON_OU_BIB=1 AND STATUT=0 order by DATE_AVIS DESC";}
- if($statut =="") {$sqlStmt = "Select * from cms_avis Where ID_CMS=$id_news AND ABON_OU_BIB=1 order by DATE_AVIS DESC";}
- return($this->sql->fetchAll($sqlStmt));
+ function getCmsAvisBiblio($id_news,$statut = "") {
+ return $this->getCmsAvis($id_news, self::AVIS_BIBLIO, $statut);
}
- // rend avis Abonne par id_news
- function getCmsAvisAbo($id_news,$statut = "")
- {
- if($statut == 1) {$sqlStmt = "Select * from cms_avis Where ID_CMS=$id_news AND ABON_OU_BIB=0 AND STATUT=1 order by DATE_AVIS DESC";}
- if($statut == 0) {$sqlStmt = "Select * from cms_avis Where ID_CMS=$id_news AND ABON_OU_BIB=0 AND STATUT=0 order by DATE_AVIS DESC";}
- if($statut ==""){$sqlStmt = "Select * from cms_avis Where ID_CMS=$id_news AND ABON_OU_BIB=0 order by DATE_AVIS DESC";}
-
- return($this->sql->fetchAll($sqlStmt));
+
+ function getCmsAvisAbo($id_news,$statut = "") {
+ return $this->getCmsAvis($id_news, self::AVIS_ABONNE, $statut);
+ }
+
+
+ function getCmsAvis($id_news, $abon_ou_bib, $statut = "") {
+ $params = array('id_cms' => $id_news,
+ 'order' => 'date_avis desc',
+ 'abon_ou_bib' => $abon_ou_bib);
+ if ("" !== $statut)
+ $params['statut'] = $statut;
+
+ return self::getLoader()->findAllBy($params);
}
+
// type =0 -> rend bulle blanche pour abonne
// type =1 -> rend bulle bleue pour bibliothecaire
- function rendHTMLCmsAvis($avis_array,$type=0)
- {
- $class_user = new Class_Users();
-
- if(is_array($avis_array))
- {
- foreach($avis_array as $avis)
- {
- $user = $class_user->getUser($avis["ID_USER"]);
-
- $zendDate = new Zend_Date($avis["DATE_AVIS"]);
- $date_avis = $zendDate->toString('dd-MM-yyyy');
- $txt_avis = urlencode($avis["AVIS"]);
- $contenu_avis = str_replace('%0D%0A','<br />',$txt_avis );
-
- $img=URL_ADMIN_IMG."stars/stars-".str_replace(".",",",$avis["NOTE"]).".gif"; $img=str_replace(",0","",$img);
-
- $html[]='<style type="text/css">';
- $html[]='table.avis {border: 2px solid #ddd; padding: 4px; border-radius: 5px}';
- $html[]='table.avis tr:first-child {font-weight: bold;}';
- $html[]='table.avis tr:first-child td {padding-bottom: 10px;}';
- $html[]='table.avis tr:first-child td:last-child {text-align:right}';
- $html[]='table.avis tr:last-child td:last-child {text-align:right}';
- $html[]='</style>';
-
-
- $html[]='<table class="avis">';
- $html[]='<tr>';
- $html[]='<td>'. $avis["ENTETE"] .'</td>';
- $html[]='<td><img src="'.$img.'"></td>';
- $html[]='</tr>';
- $html[]='<tr>';
- $html[]='<td colspan="2">';
- $html[]='<img src="'.URL_ADMIN_IMG.'avis/quote_up.jpg"/>';
- $html[]=' '.urldecode($contenu_avis).' ';
- $html[]='<img src="'.URL_ADMIN_IMG.'avis/quote_down.jpg" />';
- $html[]='</td>';
- $html[]='</tr>';
- $html[]='<tr>';
- $html[]='<td></td>';
- $html[]='<td>';
- $html[]='<div style="padding-bottom:10px;">';
- $html[]='par : <b>'.$class_user->getNomAff($user['ID_USER']).'</b> le <i>'.$date_avis.'</i></div></td>';
- $html[]='</tr>';
- $html[]='</table>';
- }
- if(is_array($html)) return(implode("",$html));
- else return('<div style="padding-left:7px"> Aucun avis pour le moment.</div>');
- }
- else return(' ');
+ function rendHTMLCmsAvis($avis_array,$type=0) {
+ if(!is_array($avis_array))
+ return '';
+
+ $html = array();
+ foreach($avis_array as $avis) {
+ $date_avis = Class_Date::humanDate($avis->getDateAvis(), 'd MMMM yyyy');
+ $contenu_avis = nl2br($avis->getAvis());
+
+ $img = URL_ADMIN_IMG."stars/stars-".str_replace(".",",",$avis->getNote()).".gif"; $img=str_replace(",0","",$img);
+
+ $html[]='<style type="text/css">';
+ $html[]='table.avis {border: 2px solid #ddd; padding: 4px; border-radius: 5px}';
+ $html[]='table.avis tr:first-child {font-weight: bold;}';
+ $html[]='table.avis tr:first-child td {padding-bottom: 10px;}';
+ $html[]='table.avis tr:first-child td:last-child {text-align:right}';
+ $html[]='table.avis tr:last-child td:last-child {text-align:right}';
+ $html[]='</style>';
+
+
+ $html[]='<table class="avis">';
+ $html[]='<tr>';
+ $html[]='<td>'. $avis->getEntete() .'</td>';
+ $html[]='<td><img src="'.$img.'"></td>';
+ $html[]='</tr>';
+ $html[]='<tr>';
+ $html[]='<td colspan="2">';
+ $html[]='<img src="'.URL_ADMIN_IMG.'avis/quote_up.jpg"/>';
+ $html[]=' '.$contenu_avis.' ';
+ $html[]='<img src="'.URL_ADMIN_IMG.'avis/quote_down.jpg" />';
+ $html[]='</td>';
+ $html[]='</tr>';
+ $html[]='<tr>';
+ $html[]='<td></td>';
+ $html[]='<td>';
+ $html[]='<div style="padding-bottom:10px;">';
+ $html[]='par : <b>'.$avis->getAuteur()->getNomAff().'</b> le <i>'.$date_avis.'</i></div></td>';
+ $html[]='</tr>';
+ $html[]='</table>';
+ }
+
+ if(is_array($html))
+ return(implode("", $html));
+
+ return('<div style="padding-left:7px"> Aucun avis pour le moment.</div>');
}
+
+
+ public function beWrittenByAbonne() {
+ return $this->setAbonOuBib(self::AVIS_ABONNE);
+ }
+
}
\ No newline at end of file
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 7f45e828c1348f7733988c7087fa0d7326276edd..b2d4ffd6e73170cd3dd70a29090c42e08b54e771 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -192,6 +192,14 @@ class Class_Users extends Storm_Model_Abstract {
}
+ public static function currentUserId() {
+ if (!$user = self::getLoader()->getIdentity())
+ return 0;
+
+ return $user->getId();
+ }
+
+
public static function sortByNom($user1, $user2) {
return (strtolower($user1->getNom()) > strtolower($user2->getNom()));
}
diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php
index dbf21b184a22f1cfee25d76f031e3aee6336abb7..f878736fef71cf8af61e567c3c555c89fd5ecd63 100644
--- a/tests/application/modules/opac/controllers/CmsControllerTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerTest.php
@@ -330,32 +330,54 @@ abstract class CmsControllerWithFeteDeLaFriteTestCase extends AbstractController
->setLangue('en')
->setParentId(224)
->setTitre('Feast of fried')
- ->setContenu('<div>an appetizing feast</div>'))));
+ ->setContenu('<div>an appetizing feast</div>')))
+ ->setAvis(1)
+ ->setAvisUsers(array($avis_mimi = Class_Avis::getLoader()
+ ->newInstanceWithId(34)
+ ->setAuteur(Class_Users::getLoader()
+ ->newInstanceWithId(98)
+ ->setPseudo('Mimi'))
+ ->setDateAvis('2012-02-05')
+ ->setNote(4)
+ ->setEntete('Hmmm')
+ ->setAvis('ça a l\'air bon')
+ ->beWrittenByAbonne())));
+
+ Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Avis')
+ ->whenCalled('findAllBy')
+ ->answers(array($avis_mimi));
+
}
}
+
+
class CmsControllerArticleViewTest extends CmsControllerWithFeteDeLaFriteTestCase {
public function setUp() {
parent::setUp();
- $this->dispatch('/cms/articleview/id/224');
+ $this->dispatch('/cms/articleview/id/224', true);
}
+
/** @test */
public function titleShouldBeFeteDeLaFrite() {
$this->assertXpathContentContains('//h1', 'La fête de la frite');
}
+
/** @test */
public function calendarDateShouldBeDu3SeptembreAu5Octobre() {
$this->assertXpathContentContains('//span[@class="calendar_event_date"]', 'Du 03 septembre au 05 octobre');
}
+
/** @test */
public function socialNetworksContainerShouldBePresent() {
$this->assertXpath('//div[@id="reseaux-sociaux-224"]');
}
+
/** @test */
public function contentShouldBePresent() {
$this->assertXpathContentContains('//div', 'Une fête appétissante');
@@ -387,14 +409,21 @@ class CmsControllerArticleViewTest extends CmsControllerWithFeteDeLaFriteTestCas
$this->dispatch('/cms/articleview/id/224');
$this->assertXpathContentContains('//h1', 'Feast of fried');
}
+
+
+ /** @test */
+ public function avisShouldContainsEnteteHmmm() {
+ $this->assertXPathContentContains('//table[@class="avis"]//td', 'Hmmm', $this->_response->getBody());
+ }
}
+
class CmsControllerArticleReadTest extends CmsControllerWithFeteDeLaFriteTestCase {
public function setUp() {
parent::setUp();
- $this->dispatch('/cms/articleread/id/224');
+ $this->dispatch('/cms/articleread/id/224', true);
}
/** @test */
@@ -411,7 +440,7 @@ class CmsControllerArticleReadTest extends CmsControllerWithFeteDeLaFriteTestCas
/** @test */
function withLanguageEnArticleReadShouldReturnEnglishTranslation() {
$this->bootstrap();
- $this->dispatch('/cms/articleread/id/224/language/en');
+ $this->dispatch('/cms/articleread/id/224/language/en', true);
$this->assertXpathContentContains('//h1', 'Feast of fried');
}
}