From 1bba874fc89195392692276cee3804c4d72a6992 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Wed, 1 Oct 2014 15:47:50 +0200
Subject: [PATCH] calendar: split articles loaded for the calendar part and the
articles list
---
.../admin/views/scripts/accueil/calendrier.phtml | 2 +-
library/Class/Calendar.php | 9 ++++++---
library/ZendAfi/View/Helper/Calendar/Table.php | 3 +++
public/opac/js/calendrier.js | 2 +-
.../controllers/CmsControllerCalendarActionTest.php | 12 +++++++++---
5 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/application/modules/admin/views/scripts/accueil/calendrier.phtml b/application/modules/admin/views/scripts/accueil/calendrier.phtml
index b7bb6d5ad58..e3845b0b0d8 100644
--- a/application/modules/admin/views/scripts/accueil/calendrier.phtml
+++ b/application/modules/admin/views/scripts/accueil/calendrier.phtml
@@ -110,7 +110,7 @@
</tr>
<tr>
- <td class="droite"><?php echo $this->_('Activer l\'affichage en pleine page'); ?></td>
+ <td class="droite"><?php echo $this->_('Activer la redirection vers la liste d\'articles'); ?></td>
<td class="gauche">
<?php echo $this->formCheckbox('display_full_page',
$this->preferences['display_full_page'],
diff --git a/library/Class/Calendar.php b/library/Class/Calendar.php
index cd936ae5ca4..35d19b1a344 100644
--- a/library/Class/Calendar.php
+++ b/library/Class/Calendar.php
@@ -59,8 +59,8 @@ class Class_Calendar {
$this->year = date("Y", $this->getTimeSource()->time());
}
$this->param["DATE"] = sprintf('%4d-%02d', $this->year, $this->month);
-// if($day)
- // $this->param['DAY'].= sprintf('-%02d', $day);
+ if($day)
+ $this->param['DAY'] = $this->param['DATE'] . sprintf('-%02d', $day);
$this->id_module = $this->param["ID_MODULE"];
}
@@ -189,7 +189,10 @@ class Class_Calendar {
public function getArticles() {
- $articles = $this->_getNextEvents();
+ $articles = isset($this->param['DAY'])
+ ? $this->_loadArticles(['event_date' => $this->param['DAY']])
+ : $this->_getNextEvents();
+
$nb_news = $this->param["NB_NEWS"];
return array_slice($articles, 0, $nb_news);
}
diff --git a/library/ZendAfi/View/Helper/Calendar/Table.php b/library/ZendAfi/View/Helper/Calendar/Table.php
index e17bd4fcbcc..074e6825288 100644
--- a/library/ZendAfi/View/Helper/Calendar/Table.php
+++ b/library/ZendAfi/View/Helper/Calendar/Table.php
@@ -191,6 +191,8 @@ class ZendAfi_View_Helper_Calendar_Table extends Zend_View_Helper_HtmlElement {
protected function getTableCalendarHeader() {
$anchor_class= ['class' => 'calendar_title_month_clickable'];
+ $anchor_class['class'].= $this->param['DISPLAY_FULL_PAGE'] ? '' : ' calendar_ajax_ready';
+
$previews_month =
$this->view->tagAnchor($this->getURL('LAST_MONTH'),
'« ',
@@ -312,6 +314,7 @@ class ZendAfi_View_Helper_Calendar_Table extends Zend_View_Helper_HtmlElement {
$cell_classes = implode(' ', array_unique($day_classes));
if (in_array('day_clickable', $day_classes)) {
$options = ['class' => $cell_classes, 'target' => '_parent'];
+ $options['class'].= $this->param['DISPLAY_FULL_PAGE'] ? '' : ' calendar_ajax_ready';
$table_cell.= $this->view->tagAnchor($this->getURL('EVENTS',$day), $today_click, $options);
} else {
$table_cell .= $this->view->tag('span', $day,['class' => $cell_classes]);
diff --git a/public/opac/js/calendrier.js b/public/opac/js/calendrier.js
index 57381a4cc59..a70e163d9f4 100644
--- a/public/opac/js/calendrier.js
+++ b/public/opac/js/calendrier.js
@@ -1,5 +1,5 @@
var ajaxify_calendars = function () {
- var month_link = $("a.calendar_title_month_clickable:first-child, a.calendar_title_month_clickable:last-child, .calendar .month_list a:not(.no_event), .filters a");
+ var month_link = $(".calendar_ajax_ready, .calendar_title_left_arrow a, .calendar_title_right_arrow a, .calendar .month_list a:not(.no_event), .filters a");
month_link.click(function(event) {
var url = $(this).attr('href');
diff --git a/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php b/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php
index a255427b25c..1fddada33d2 100644
--- a/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerCalendarActionTest.php
@@ -334,21 +334,27 @@ class CmsControllerCalendarActionWithDayTest extends CmsControllerCalendarAction
}
+ /** @test */
+ public function currentMonthLinkShouldHaveReadyAjaxClass() {
+ $this->assertXPath('//table[@class="calendar_main"]//td[@class="calendar_title_month"]//a[contains(@class, "calendar_ajax_ready")]');
+ }
+
+
/** @test */
public function newsOfThe30thShouldBePresent() {
- $this->assertXPathContentContains('div[@class="calendar"]//article//header//h2//a', 'News of the 30th september');
+ $this->assertXPathContentContains('//div[@class="calendar"]//article//header//h2//a', 'News of the 30th September');
}
/** @test **/
public function newsOfThe15ThSeptemberEventShouldNotBPresent() {
- $this->assertNotXPathContentContains('div[@class="calendar"]//article//header', 'News of the 15th september');
+ $this->assertNotXPathContentContains('//div[@class="calendar"]//article//header', 'News of the 15th September');
}
/** @test */
public function newsOfThe15thSeptemberShouldBeClickableAtThe15Th() {
- $this->assertXPath('div[@class="calendar"]//table//a[contains(@class, "day_clickable")][contains(@href, "date/2014-09-15")]');
+ $this->assertXPath('//div[@class="calendar"]//table//a[contains(@class, "day_clickable")][contains(@href, "date/2014-09-15")]');
}
}
?>
\ No newline at end of file
--
GitLab