diff --git a/VERSIONS_WIP/hackfest_default_filters_library_widget b/VERSIONS_WIP/hackfest_default_filters_library_widget
new file mode 100644
index 0000000000000000000000000000000000000000..eb4afe1b4d5ec25ef2813f397cc4c3ac33662db8
--- /dev/null
+++ b/VERSIONS_WIP/hackfest_default_filters_library_widget
@@ -0,0 +1 @@
+ - Administration : ajout d'un lien "appliquer comme filtres par défaut" dans la boite bibliothèque.
\ No newline at end of file
diff --git a/application/modules/opac/controllers/BibController.php b/application/modules/opac/controllers/BibController.php
index 4ca5cd844ae6ae478b1867e5f9d475c49cc6affb..2214620b3c580e07e84ab7a5ed18dfd183f24df7 100644
--- a/application/modules/opac/controllers/BibController.php
+++ b/application/modules/opac/controllers/BibController.php
@@ -34,7 +34,7 @@ class BibController extends ZendAfi_Controller_Action {
$bibs = array_merge($bibs, $zone->getVisibleBibs());
$this->view->articles = $this->_getArticlesForBibs($bibs);
-- $this->view->global_map_path = sprintf("%s/photobib/global.jpg", USERFILESURL);
+ $this->view->global_map_path = sprintf("%s/photobib/global.jpg", USERFILESURL);
$this->view->zones = $zones;
}
@@ -212,6 +212,7 @@ class BibController extends ZendAfi_Controller_Action {
public function widgetPageAction() {
$viewRenderer = $this->getHelper('ViewRenderer');
+
if ($this->_getParam('render') === 'ajax')
$viewRenderer->setLayoutScript('empty.phtml');
@@ -219,18 +220,35 @@ class BibController extends ZendAfi_Controller_Action {
$id_division = (int)$this->_getParam('id_division');
$page = (int)$this->_getParam('page');
+ $helper = (new ZendAfi_View_Helper_Accueil_Library($id_module,
+ $this->_getSettingsFor($id_division, $id_module)))
+ ->setView($this->view)
+ ->setPage($page)
+ ->setSelectedFilters($this->_getSelectedFilters());
+
+ $this->view->lib_helper = $helper;
+ }
+
+
+ protected function _getSelectedFilters() {
$filter_keys = (new Class_Systeme_ModulesAccueil_Library())->getStaticFiltersKeys();
- $selected_filters = $this->_helper->selectedFilters($filter_keys);
+ return $this->_helper->selectedFilters($filter_keys);
+ }
+
- $module_params = Class_Profil::getCurrentProfil()
+ protected function _getSettingsFor($id_division, $id_module) {
+ $settings = Class_Profil::getCurrentProfil()
->getBoitesDivision($id_division)[$id_module];
- $helper = new ZendAfi_View_Helper_Accueil_Library($id_module, $module_params);
- $helper->setView($this->view);
- $helper->setPage($page);
- $helper->setSelectedFilters($selected_filters);
+ if(!Class_Users::isCurrentUserCanAccesBackend() || !$this->_getParam('default_filters'))
+ return $settings;
- $this->view->lib_helper = $helper;
+ $settings['preferences']['default_filters'] = $this->_getSelectedFilters();
+ Class_Profil::getCurrentProfil()
+ ->updateModuleConfigAccueil($id_module, $settings)
+ ->save();
+
+ return $settings;
}
diff --git a/library/Class/FilterSettings.php b/library/Class/FilterSettings.php
index 72f82fa2561957bb79a59b3074cd950c80c6be18..e97fb0aabb7def64fd274bcfcec3cbb1a79100c7 100644
--- a/library/Class/FilterSettings.php
+++ b/library/Class/FilterSettings.php
@@ -69,5 +69,13 @@ class Class_FilterSettings extends Class_Entity {
$module = $this->getModule();
return $this->getFiltersPosition() == $module::POSITION_RIGHT;
}
+
+
+ public function getActiveFilters() {
+ if($this->getUseDefaultFilters())
+ return $this->getDefaultFilters();
+
+ return $this->getSelectedFilters();
+ }
}
?>
\ No newline at end of file
diff --git a/library/Class/Systeme/ModulesAccueil/Library.php b/library/Class/Systeme/ModulesAccueil/Library.php
index 58439504c4ae17a29c2815c3c213ba4352b0c45e..67a1a7441e627404e810fe8c6a5c25e0c7aa9836 100644
--- a/library/Class/Systeme/ModulesAccueil/Library.php
+++ b/library/Class/Systeme/ModulesAccueil/Library.php
@@ -73,6 +73,7 @@ class Class_Systeme_ModulesAccueil_Library extends Class_Systeme_ModulesAccueil_
'filters' => '',
'filters_display_modes' => self::DISPLAY_LIST,
'filters_position' => self::POSITION_RIGHT,
+ 'default_filters' => [],
'linked' => 0,
'osm_map' => 0];
@@ -138,7 +139,6 @@ class Class_Systeme_ModulesAccueil_Library extends Class_Systeme_ModulesAccueil_
protected function _getCustomFields() {
$custom_fields = Class_CustomField_Model::getModel('Bib')->getFields();
$custom_fields_list = [];
-
foreach ($custom_fields as $field)
$custom_fields_list['custom_field_' . $field->getId()] = $field->getLabel();
diff --git a/library/ZendAfi/View/Helper/Accueil/Library.php b/library/ZendAfi/View/Helper/Accueil/Library.php
index 9c9734ba81a2d36f0b24920954ec517db766b283..1f17931b44a74f99468e3ed724f94eaf339d7a08 100644
--- a/library/ZendAfi/View/Helper/Accueil/Library.php
+++ b/library/ZendAfi/View/Helper/Accueil/Library.php
@@ -24,8 +24,10 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
protected $page,
$_filters,
$_selected_filters = [],
+ $_use_default_filters = true,
$_filter_settings;
+
public function shouldCacheContent() {
return false;
}
@@ -38,6 +40,22 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
}
+ protected function _addToDefaultFiltersLink() {
+ if(!Class_Users::isCurrentUserCanAccesBackend())
+ return '';
+ return $this->view->tagAnchor($this->view->url(array_merge(
+ $this->_getBaseUrl(),
+ ['default_filters' => 1,
+ 'render' => null])),
+ Class_Admin_Skin::current()
+ ->renderMenuIconOn('moderation',
+ $this->view,
+ ['title' => $this->view->_('Enregistrer comme filtres par défaut')]),
+ ['class' => 'default_filters']);
+
+ }
+
+
public function getContent() {
$nb_aff = $this->preferences['nb_aff']
? $this->preferences['nb_aff']
@@ -47,9 +65,9 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
? $this->preferences['pagination']
: $this->_getDefaultPreference('pagination');
- $libraries = $this->_filterLibraries($this->_loadLibraries());
+ $libraries = $this->_loadLibraries();
$content = $this->_renderFilters();
-
+ $libraries = $this->_filterLibraries($libraries);
$content .= $this->preferences['osm_map']
? $this->view->librariesMap(Class_Bib::filterByCoordinates($libraries),
'#boite_' . $this->getIdModule(),
@@ -66,16 +84,17 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
$pagination == Class_Systeme_ModulesAccueil_Library::PAGINATION_BOTH)
$content .= $this->_getPaginator($libraries, $nb_aff, $this->page);
- return $content;
+ return $this->_addToDefaultFiltersLink() . $content;
}
public function setSelectedFilters($filters) {
$this->_selected_filters = $filters;
+ $this->_use_default_filters = false;
+ return $this;
}
-
protected function _filterLibraries($libraries) {
$filters = (new Class_Systeme_ModulesAccueil_Library())->getAvailableFilters();
@@ -90,10 +109,10 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
$params[] = $filter_key;
}
- if (!isset($this->_selected_filters[$filter_key]))
+ if (!isset($this->_getActiveFilters()[$filter_key]))
continue;
- $params[] = $this->_selected_filters[$filter_key];
+ $params[] = $this->_getActiveFilters()[$filter_key];
$libraries = call_user_func_array([$this, $func_name],
$params);
}
@@ -191,6 +210,10 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
$this->_filter_settings
->setFilters($this->_filters)
->setSelectedFilters($this->_selected_filters)
+ ->setDefaultFilters(isset($this->preferences['default_filters'])
+ ? $this->preferences['default_filters']
+ : [])
+ ->setUseDefaultFilters($this->_use_default_filters)
->setModelLabel('Bib')
->setUrlParams($this->_getBaseUrl())
->setFiltersDisplayMode($this->preferences['filters_display_modes'])
@@ -208,19 +231,27 @@ class ZendAfi_View_Helper_Accueil_Library extends ZendAfi_View_Helper_Accueil_Ba
protected function _getBaseUrl() {
$filters = [];
- foreach ($this->_selected_filters as $id => $values) {
+ foreach ($this->_getActiveFilters() as $id => $values) {
$filter_key = is_int($id) ? 'custom_field_' . $id : $id;
$filters[$filter_key] = implode(';', $values);
}
return array_merge(['controller' => 'bib',
'action' => 'widget-page',
+ 'default_filters' => null,
'id_module' => $this->getIdModule(),
'id_division' => $this->division],
$filters);
}
+ protected function _getActiveFilters() {
+ if(!$this->_filter_settings)
+ return [];
+ return $this->_filter_settings->getActiveFilters();
+ }
+
+
protected function _getDefaultPreference($name) {
return (new Class_Systeme_ModulesAccueil_Library())->getDefaultValues()[$name];
}
diff --git a/library/ZendAfi/View/Helper/Filters/Element.php b/library/ZendAfi/View/Helper/Filters/Element.php
index 2e4e959de135181501e1e10dfb45c6cfe59d156a..1d6836f68e9bb56080ae5a152fcc0b76af487fdd 100644
--- a/library/ZendAfi/View/Helper/Filters/Element.php
+++ b/library/ZendAfi/View/Helper/Filters/Element.php
@@ -68,7 +68,7 @@ abstract class ZendAfi_View_Helper_Filters_Element extends ZendAfi_View_Helper_B
public function render($settings) {
- $this->_active_filters = $settings->getSelectedFilters();
+ $this->_active_filters = $settings->getActiveFilters();
$this->_url_params = $settings->getUrlParams();
$this->_model_label = $settings->getModelLabel();
$this->_available_filters = $settings->getAvailableFilters();
diff --git a/library/ZendAfi/View/Helper/Filters/Strategy/Elements.php b/library/ZendAfi/View/Helper/Filters/Strategy/Elements.php
index 3e71b453d22fa54baa1eee41887e73fae3c85859..87845f426715029d8ed011017b7595e7e5f6fc34 100644
--- a/library/ZendAfi/View/Helper/Filters/Strategy/Elements.php
+++ b/library/ZendAfi/View/Helper/Filters/Strategy/Elements.php
@@ -50,8 +50,10 @@ abstract class ZendAfi_View_Helper_Filters_Strategy_Elements extends ZendAfi_Vie
protected function _getSelectedElementsLabel() {
$labels = [];
foreach ($this->_getElements() as $value => $label) {
- if ($this->_isSelected($value))
- $labels [] = $label;
+ if (!$this->_isSelected($value))
+ continue;
+
+ $labels [] = $label;
}
return $labels;
diff --git a/public/admin/js/onload_utils.js b/public/admin/js/onload_utils.js
index 78cd808688a4fe6f3990e0c0aa88d285b049cb64..d2ef3bd4f457bf595f4530d7d0a738549435fe87 100644
--- a/public/admin/js/onload_utils.js
+++ b/public/admin/js/onload_utils.js
@@ -75,6 +75,7 @@ var autoHideShowConfigurationModule = function() {
autoHideShowTagOnParentHover('a[class^="edit_"]', 'div.boite');
autoHideShowTagOnParentHover('.select_kiosque_form', 'div.boite');
autoHideShowTagOnParentHover('.newsadd', 'div.boite');
+ autoHideShowTagOnParentHover('.default_filters', 'div.boite');
}
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 222e864e5776fead9a6dbe9813c59695b077f7ae..dfd1616af44fbddb804fb067da5b12d2de4d0714 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -36,7 +36,8 @@ a {
/* Boites bannière*/
.configuration_module,
-.configuration_module + .newsadd {
+.configuration_module + .newsadd,
+.configuration_module + .default_filters {
z-index: 1000;
position: relative;
height: 0px;
@@ -44,7 +45,8 @@ a {
cursor:pointer;
}
-.configuration_module + .newsadd {
+.configuration_module + .newsadd,
+.configuration_module + .default_filters {
margin-right:60px;
}
diff --git a/public/opac/js/renderFilters/ajaxifyFilters.js b/public/opac/js/renderFilters/ajaxifyFilters.js
index 0527ab6b88374481e699db56abfe63b61afd6a3d..8a642a431ea0f2ee17a5effb8b9da25532dd1726 100644
--- a/public/opac/js/renderFilters/ajaxifyFilters.js
+++ b/public/opac/js/renderFilters/ajaxifyFilters.js
@@ -45,7 +45,7 @@
};
- var links = widget.find(".filters a");
+ var links = widget.find(".filters a, a.default_filters");
links.click(function(event) {
refresh($(this), event, 'href');
});
diff --git a/public/opac/js/renderFilters/list.css b/public/opac/js/renderFilters/list.css
index 4bdcfeb18580d1352ec0493a20572f871b88332a..39f62103c06437f15b7aaec9cc766b6716c158cb 100644
--- a/public/opac/js/renderFilters/list.css
+++ b/public/opac/js/renderFilters/list.css
@@ -79,5 +79,5 @@
}
.boite ul.filters.list .search h2 {
- display: none;
+ display: none;
}
diff --git a/public/opac/js/renderFilters/tabs.css b/public/opac/js/renderFilters/tabs.css
index c087500384185ca9e97b0dd89c864a64bfa877bc..f0707dc1e6e006ac47f8fd125138f0419be4fe9a 100644
--- a/public/opac/js/renderFilters/tabs.css
+++ b/public/opac/js/renderFilters/tabs.css
@@ -1,83 +1,83 @@
.boite ul.filters.tabs {
- padding: 0;
- width: 100%;
+ padding: 0;
+ width: 100%;
}
.boite ul.filters.tabs > li {
- display: inline-block;
- vertical-align: top;
- position: relative;
- padding: 0px 5px 5px 0px;
- min-width: 100px;
+ display: inline-block;
+ vertical-align: top;
+ position: relative;
+ padding: 0px 5px 5px 0px;
+ min-width: 100px;
}
.boite ul.filters.tabs > li h2,
.boite ul.filters.tabs .search form {
- text-align: center;
- padding: 5px 5px 5px 26px;
- margin: 0px;
+ text-align: center;
+ padding: 5px 5px 5px 26px;
+ margin: 0px;
}
.boite ul.filters.tabs > li h2 {
- background: transparent url(../../images/buttons/down-chevron.png) 2px center no-repeat;
+ background: transparent url(../../images/buttons/down-chevron.png) 2px center no-repeat;
}
.boite ul.filters.tabs > li:hover h2 {
- background-image: url(../../images/buttons/up-chevron.png);
+ background-image: url(../../images/buttons/up-chevron.png);
}
.boite ul.filters.tabs > li h2,
.boite ul.filters.tabs ul,
.boite ul.filters.tabs .search form {
- background-color: #ddd;
+ background-color: #ddd;
}
.boite ul.filters.tabs li {
- list-style-type: none;
+ list-style-type: none;
}
.boite ul.filters.tabs ul {
- padding: 0px;
- margin: 0px;
- position: absolute;
- display: none;
- white-space: nowrap;
- box-shadow: 0px 10px 10px rgba(0,0,0,0.5);
- z-index: 100;
- min-width: 90%;
+ padding: 0px;
+ margin: 0px;
+ position: absolute;
+ display: none;
+ white-space: nowrap;
+ box-shadow: 0px 10px 10px rgba(0,0,0,0.5);
+ z-index: 100;
+ min-width: 90%;
}
.boite ul.filters.tabs li { //iOS touch :hover workaround
cursor: pointer;
-}
+ }
.boite ul.filters.tabs li:hover ul {
- display: block;
+ display: block;
}
.boite ul.filters.tabs ul li.selected {
- font-weight: bold;
+ font-weight: bold;
}
.boite ul.filters.tabs ul li {
- display: block;
+ display: block;
}
.boite ul.filters.tabs ul li a {
- display: block;
- padding: 5px;
+ display: block;
+ padding: 5px;
}
.boite ul.filters.tabs ul li a:hover {
- background-color: white;
+ background-color: white;
}
.boite ul.filters.tabs .search h2 {
- display: none;
+ display: none;
}
.boite ul.filters.tabs .search form {
- padding-left:5px;
+ padding-left:5px;
}
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/BibControllerTest.php b/tests/application/modules/opac/controllers/BibControllerTest.php
index 29468ce1b1cca3dae6b0b0ab542b078c22786f1c..cbc776635e989e728a02086b4d1c3737b325a792 100644
--- a/tests/application/modules/opac/controllers/BibControllerTest.php
+++ b/tests/application/modules/opac/controllers/BibControllerTest.php
@@ -1721,6 +1721,12 @@ class BibControllerSelectionOrderDisplayAndFiltersTest extends BibControllerWidg
public function withPositionRightListFilterClassShouldContainsRight() {
$this->assertXPath('//ul[contains(@class, "filters")][contains(@class, "list")][contains(@class, "right")]');
}
+
+
+ /** @test */
+ public function customfieldServiceShouldContainsValueRestaurationAddToDefault() {
+ $this->assertXPath('//li//input[@type="checkbox"][@value="Restauration"][@checked]');
+ }
}
@@ -1906,6 +1912,145 @@ class BibControllerMapActionWithLocationTest extends BibControllerWithThreeBibTe
+class BibControllerDefaultFiltersTest extends BibControllerWidgetPageTestCase {
+ protected $_bib_wrapper;
+
+ public function setUp() {
+ parent::setUp();
+ $this->dispatch('/bib/widget-page/id_module/1/id_division/2/page/1/opening/opened/default_filters/1', true);
+ }
+
+
+ /** @test */
+ public function openingOpenedShouldBeSaved() {
+ $this->assertEquals(['opened'], Class_Profil::getCurrentProfil()
+ ->getBoitesDivision(2)[1]['preferences']['default_filters']['opening']);
+ }
+
+
+ /** @test */
+ public function linkToSaveDefaultFilterShouldContainsOpening() {
+ $this->assertXPath('//a[contains(@href, "/bib/widget-page/id_module/1/id_division/2/page/1/opening/opened/default_filters/1")][@class="default_filters"]');
+ }
+}
+
+
+class BibControllerAddDefaultCustomFieldsFiltersTest extends BibControllerWidgetPageTestCase {
+ protected $_bib_wrapper;
+
+ public function setUp() {
+ parent::setUp();
+ $this->dispatch('/bib/widget-page/id_module/1/id_division/2/page/1/custom_field_7/Restauration/default_filters/1', true);
+ }
+
+
+ /** @test */
+ public function restaurationShouldBeSaved() {
+ $this->assertEquals(['Restauration'], Class_Profil::getCurrentProfil()
+ ->getBoitesDivision(2)[1]['preferences']['default_filters']['7']);
+ }
+}
+
+
+
+class BibControllerWithDefaultFiltersTest extends BibControllerWidgetPageTestCase {
+ protected $_bib_wrapper;
+
+ public function setUp() {
+ parent::setUp();
+
+ Class_Profil::getCurrentProfil()
+ ->updateModuleConfigAccueil(1, [
+ 'division' => '2',
+ 'type_module' => 'LIBRARY',
+ 'preferences' => array_merge($this->_preferences,
+ ['default_filters' => ['opening' => ['opened']]])
+ ]);
+
+ $this->dispatch('/bib/widget-page/id_module/1/id_division/2/page/1', true);
+ }
+
+
+ /** @test */
+ public function openedShouldNotBeSelected() {
+ $this->assertXPathContentContains('//ul/li[not(@class="selected")]/a', 'Ouvert aujourd\'hui');
+ }
+}
+
+
+
+class BibControllerDeleteDefaultFiltersTest extends BibControllerWidgetPageTestCase {
+ protected $_bib_wrapper;
+
+ public function setUp() {
+ parent::setUp();
+
+ Class_Profil::getCurrentProfil()
+ ->updateModuleConfigAccueil(1, [
+ 'division' => '2',
+ 'type_module' => 'LIBRARY',
+ 'preferences' => array_merge($this->_preferences,
+ ['default_filters' => ['opening' => ['opened']]])
+ ])
+ ->save();
+
+ $this->dispatch('/bib/widget-page/id_module/1/id_division/2/page/1/default_filters/1', true);
+ }
+
+
+ /** @test */
+ public function openedShouldBeSelected() {
+ $this->assertXPath('//ul/li[not(@class="selected")]/a[text()="Ouvert aujourd\'hui"]');
+ }
+
+
+ /** @test */
+ public function openedShouldHaveBeenRemovedFromSettings() {
+ $this->assertEmpty(Class_Profil::getCurrentProfil()->getBoitesDivision(2)[1]['preferences']['default_filters']);
+ }
+
+
+ /** @test */
+ public function linkToSaveDefaultFilterShouldNotContainsOpening() {
+ $this->assertXPath('//a[contains(@href, "/bib/widget-page/id_module/1/id_division/2/page/1/default_filters/1")][@class="default_filters"]');
+ }
+}
+
+
+
+
+class BibControllerWithDefaultFiltersAllFacetsSelectedTest extends BibControllerWidgetPageTestCase {
+ protected $_bib_wrapper;
+
+ public function setUp() {
+ parent::setUp();
+
+ Class_Profil::getCurrentProfil()
+ ->updateModuleConfigAccueil(1, [
+ 'division' => '2',
+ 'type_module' => 'LIBRARY',
+ 'preferences' => array_merge($this->_preferences,
+ ['default_filters' => ['opening' => ['opened']]])
+ ]);
+
+ $this->dispatch('/bib/widget-page/id_module/1/id_division/2/page/1/opening/all', true);
+ }
+
+
+ /** @test */
+ public function openedShouldNotBeSelected() {
+ $this->assertXPathContentContains('//ul/li[not(@class="selected")]/a', 'Ouvert aujourd\'hui');
+ }
+
+
+ /** @test */
+ public function openedAllShouldBeSelected() {
+ $this->assertXPathContentContains('//ul/li[@class="selected"]/a[contains(@href, "/opening/all")]', 'Tous');
+ }
+}
+
+
+
class BibControllerWidgetPageAsAdminTest extends BibControllerWithThreeBibTestCase {
protected $_storm_default_to_volatile = true;