From 7dc85f2e71f386a0da72c1ba3ba9cf32788df1c7 Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@afi-sa.fr>
Date: Wed, 28 Jan 2015 12:15:01 +0100
Subject: [PATCH] rel #14943 : Add album title in numeric resources tab +
refacto
---
.../opac/controllers/NoticeajaxController.php | 14 +----
library/Class/FRBR/Link.php | 30 +++++++++
library/ZendAfi/View/Helper/RecordAlbums.php | 61 +++++++++++++++++++
.../controllers/NoticeAjaxControllerTest.php | 6 ++
4 files changed, 98 insertions(+), 13 deletions(-)
create mode 100644 library/ZendAfi/View/Helper/RecordAlbums.php
diff --git a/application/modules/opac/controllers/NoticeajaxController.php b/application/modules/opac/controllers/NoticeajaxController.php
index d883d624553..1d38ca2254e 100644
--- a/application/modules/opac/controllers/NoticeajaxController.php
+++ b/application/modules/opac/controllers/NoticeajaxController.php
@@ -301,19 +301,7 @@ class NoticeAjaxController extends Zend_Controller_Action {
if (null !== $exemplaire = Class_Exemplaire::findFirstBy(['id_notice' => $this->id_notice]))
$html .= $this->view->renderAlbum($exemplaire->getAlbum());
- $link_sorted = [];
- foreach(Class_FRBR_Link::findAllAlbumsFromNotice($this->notice) as $link) {
- $type = $link->getSourceType() == Class_FRBR_Link::TYPE_NOTICE ? 'Source' : 'Target';
- $link_sorted[$link->getType()->{'getFrom' . $type}()][] = $link;
- }
-
- foreach ($link_sorted as $from_source => $links) {
- $html .= '<div class="notice_info_titre">' . $from_source . '</div>';
- foreach ($links as $link) {
- $type = $link->getSourceType() == Class_FRBR_Link::TYPE_NOTICE ? 'Target' : 'Source';
- $html .= $this->view->renderAlbum($link->{'get' . $type . 'Entity'}());
- }
- }
+ $html .= $this->view->recordAlbums($this->notice);
if ('' == $html)
$html = sprintf('<p>%s</p>', $this->view->_('Aucune ressource correspondante'));
diff --git a/library/Class/FRBR/Link.php b/library/Class/FRBR/Link.php
index 73a6be02013..7bcb540824c 100644
--- a/library/Class/FRBR/Link.php
+++ b/library/Class/FRBR/Link.php
@@ -277,6 +277,36 @@ class Class_FRBR_Link extends Storm_Model_Abstract {
}
+ /**
+ * @param $type string self::TYPE_* const
+ * @return Storm_Model_Abstract or null
+ */
+ public function getEntityOfType($type) {
+ if ($this->getSourceType() == $type)
+ return $this->getSourceEntity();
+
+ if ($this->getTargetType() == $type)
+ return $this->getTargetEntity();
+
+ return null;
+ }
+
+
+ /**
+ * @param $type string self::TYPE_* const
+ * @return string
+ */
+ public function getLinkLabelOfEntityType($type) {
+ if ($this->getSourceType() == $type)
+ return $this->getType()->getFromSource();
+
+ if ($this->getTargetType() == $type)
+ return $this->getType()->getFromTarget();
+
+ return null;
+ }
+
+
protected function _route($url) {
try {
$request = new Zend_Controller_Request_Http($url);
diff --git a/library/ZendAfi/View/Helper/RecordAlbums.php b/library/ZendAfi/View/Helper/RecordAlbums.php
new file mode 100644
index 00000000000..0e516667213
--- /dev/null
+++ b/library/ZendAfi/View/Helper/RecordAlbums.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2012-2014, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * 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
+ */
+
+
+class ZendAfi_View_Helper_RecordAlbums extends Zend_View_Helper_Abstract {
+ public function recordAlbums($record) {
+ $html = '';
+ foreach ($this->_getGroupedLinks($record) as $from_source => $links)
+ $html .= $this->_renderGroup($from_source, $links);
+
+ return $html;
+ }
+
+
+ protected function _renderGroup($label, $links) {
+ $html = $this->view->tag('div', $label, ['class' => 'notice_info_titre']);
+ foreach ($links as $link)
+ $html .= $this->_renderLink($link);
+
+ return $html;
+ }
+
+
+ protected function _renderLink($link) {
+ if (!$album = $link->getEntityOfType(Class_FRBR_Link::TYPE_ALBUM))
+ return '';
+
+ return $this->view->tag('h3', $album->getTitre())
+ . $this->view->renderAlbum($album);
+ }
+
+
+ protected function _getGroupedLinks($record) {
+ $link_sorted = [];
+ foreach(Class_FRBR_Link::findAllAlbumsFromNotice($record) as $link) {
+ $link_label = $link->getLinkLabelOfEntityType(Class_FRBR_Link::TYPE_NOTICE);
+ $link_sorted[$link_label][] = $link;
+ }
+
+ return $link_sorted;
+ }
+}
+?>
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
index aa446a91034..c6371ced56d 100644
--- a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
+++ b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
@@ -359,6 +359,12 @@ class NoticeAjaxControllerResNumeriquesFromFrbrLinkTest extends AbstractControll
public function frbrLinkTargetLabelShouldBeDisplayed() {
$this->assertXPathContentContains('//div[@class="notice_info_titre"]', 'A pour pistes audio', $this->_response->getBody());
}
+
+
+ /** @test */
+ public function frbrLinkedAlbumTitleShouldBeDisplayed() {
+ $this->assertXPathContentContains('//h3', 'Aces High');
+ }
}
--
GitLab