Releasing 1.0.18

Author: technicalguru

js/search-filter.js

@@ -0,0 +1,23 @@
+
+class SearchFilter {
+
+	searchSubmit(domElement) {
+		var filterForm = jQuery('#filterForm');
+		if (filterForm.length == 0) {
+			jQuery('#searchForm').submit();
+		} else {
+			jQuery('#filterForm input[name=search]').val(jQuery('#searchForm input[name=search]').val());
+			filterForm.submit();
+		}
+	}
+
+	filterSubmit(domElement) {
+		var searchForm = jQuery('#searchForm');
+		if (searchForm.length > 0) {
+			jQuery('#filterForm input[name=search]').val(jQuery('#searchForm input[name=search]').val());
+		}
+		jQuery('#filterForm').submit();
+	}
+}
+var searchFilter = new SearchFilter();
+

src/WebApp/BootstrapTheme/BootstrapTheme.php

@@ -15,6 +15,8 @@ class BootstrapTheme extends \WebApp\DefaultTheme\DefaultTheme {
 	public const DYNAMICFIELDS      = 'dynamicfields';
 	public const DYNAMICCHECKENABLE = 'dynamiccheckenable';
 	public const CROPPERJS          = 'cropperjs';
+	public const SEARCH_FILTER      = 'search-filter';
+
 	public const CSS_URI            = 'BootstrapTheme/CssUri';
 
 	public function __construct($app) {

src/WebApp/BootstrapTheme/DefaultLayout.php

@@ -194,6 +194,9 @@ protected function renderJavascript() {
 		if ($this->theme->hasFeature(BootstrapTheme::REMOTESEARCH)) {
 			$rc .= '<script src="'.Utils::getJavascriptPath('remote-search.js', TRUE).'"></script>';
 		}
+		if ($this->theme->hasFeature(BootstrapTheme::SEARCH_FILTER)) {
+			$rc .= '<script src="'.Utils::getJavascriptPath('search-filter.js', TRUE).'"></script>';
+		}
 		if ($this->theme->hasFeature(BootstrapTheme::DYNAMICFIELDS)) {
 			$rc .= '<script src="'.Utils::getJavascriptPath('dynamic-fields.js', TRUE).'"></script>';
 		}

src/WebApp/BootstrapTheme/FilterPanelRenderer.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace WebApp\BootstrapTheme;
+
+class FilterPanelRenderer extends \WebApp\DefaultTheme\DivRenderer {
+
+	public function __construct($theme, $component) {
+		parent::__construct($theme, $component);
+		$this->theme->addFeature(BootstrapTheme::SEARCH_FILTER);
+	}
+
+}
+

src/WebApp/BootstrapTheme/SearchFilterBarRenderer.php

@@ -6,7 +6,7 @@ class SearchFilterBarRenderer extends \WebApp\DefaultTheme\FormRenderer {
 
 	public function __construct($theme, $component) {
 		parent::__construct($theme, $component);
-		$this->addClass('mt-sm-4');
+		$this->theme->addFeature(BootstrapTheme::SEARCH_FILTER);
 	}
 
 }

src/WebApp/Component/FilterPanel.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace WebApp\Component;
+
+use TgI18n\I18N;
+use TgUtils\Request;
+
+class FilterPanel extends Div {
+
+	protected static $filter;
+
+	public function __construct($parent) {
+		parent::__construct($parent);
+		$this->addClass('filter-panel');
+		$this->form = new Form($this, 'filterForm');
+		$this->form->setAction(Request::getRequest()->originalPath);
+		$this->addFilterSections();
+		$this->addButtons();
+	}
+
+	public function addFilterCheckbox($parent, $groupId, $value, $label, $defaultChecked = FALSE) {
+		$div = new Div($parent);
+		$div->addClass('form-group');
+		$cb = new Checkbox($div, 'filter'.ucfirst($groupId).ucfirst($value), $groupId.':'.$value);
+		$cb->setName('filter[]');
+		$cb->setLabel($label);
+		$cb->setAnnotation('webapp/renderer', 'WebApp\\DefaultTheme\\PlainCheckboxRenderer');
+		if (self::hasFilter($groupId)) {
+			$cb->setChecked(self::isFilterSet($groupId, $value));
+		} else {
+			$cb->setChecked($defaultChecked);
+		}
+		return $cb;
+	}
+
+	public function addSection($label, $id) {
+		$div = new Div($this->form);
+		$div->addClass('filter-section');
+		$p = new Paragraph($div);
+		$p->addClass('section-toggle');
+		$l = new Link($p, '#'.$id, strtoupper(I18N::_($label)));
+		$l
+			->addClass('link-primary')
+			->setAttribute('data-toggle', 'collapse')
+			->setAttribute('role', 'button')
+			->setAttribute('aria-expanded', 'true')
+			->setAttribute('aria-controls', $id);
+
+		$rc = new Div($div);
+		$rc
+			->setId($id)
+			->addClass('section-content', 'collapse', 'show');
+		return $rc;
+	}
+
+	protected function addButtons() {
+		$div = new Div($this->form);
+		$div->addClass('filter-submit');
+		$request = Request::getRequest();
+		$search  = $request->getParam('search');
+		new HiddenInput($div, 'search', $search);
+		$btn = new SubmitButton($div, 'apply_label');
+		$btn->setAttribute('onclick', 'searchFilter.filterSubmit(this);return false');
+	}
+
+	public static function getFilters($request = NULL) {
+		if (self::$filter == NULL) {
+			if ($request == NULL) $request = Request::getRequest();
+			self::$filter = array();
+			foreach ($request->getParam('filter', array()) AS $filter) {
+				list($name, $value) = explode(':', $filter, 2);
+				self::$filter[$name][] = $value;
+			}
+		}
+		return self::$filter;
+	}
+
+	public static function getFilter($name, $request = NULL) {
+		$filters = self::getFilters($request);
+		if (isset($filters[$name])) return $filters[$name];
+		return array();
+	}
+
+	public static function isFilterSet($name, $value, $request = NULL) {
+		$filters = self::getFilter($name, $request);
+		return in_array($value, $filters);
+	}
+
+	public static function hasFilter($name, $request = NULL) {
+		$filters = self::getFilter($name, $request);
+		return count($filters) > 0;
+	}
+
+}
+

src/WebApp/Component/SearchFilterBar.php

@@ -7,11 +7,12 @@
 class SearchFilterBar extends Form {
 
 	public function __construct($parent) {
-		parent::__construct($parent, 'search', Form::INLINE);
+		parent::__construct($parent, 'searchForm', Form::INLINE);
 		$this->setMethod('GET');
 		$this->setAction(Request::getRequest()->originalPath);
 		$this->searchInput = $this->createSearchInput();
 		$this->button = $this->createSubmitButton();
+		$this->button->setAttribute('onclick', 'searchFilter.searchSubmit(this); return false');
 		$this->createFilters();
 	}