- Better code style

- Clened views structure - Use session to store the filter state
2026-07-18 15:32:17 +00:00 · 2017-11-29 18:26:43 +01:00
parent 80b954365e
commit 34329edb74
5 changed files with 556 additions and 112 deletions
@@ -1,15 +1,51 @@
-<div>
-	<?php $this->view('widgets/filter/selectFields', array('listFields' => $listFields)); ?>
-</div>
+<?php
+	$this->load->view(
+		'templates/header',
+		array('title' => 'Filters', 'tablesort' => true, 'tableid' => 'tableDataset', 'widgets' => 'zebra')
+	);
+?>
+<script language="Javascript" type="text/javascript">
+	$(document).ready(function() {

-<br>
+		$("#addFilter").change(function() {
+			$("#filterForm").submit();
+		});

-<div>
-	<?php $this->view('widgets/filter/selectFilters', array('metaData' => $metaData)); ?>
-</div>
+		$(".remove-filter").each(function() {
+			$(this).click(function() {
+				$("#rmFilter").val($(this).attr('filterToRemove'));
+			});
+		});

-<br>
+		$(".select-filter-operation").change(function() {
+			$("#filterForm").submit();
+		});

-<div>
-	<?php $this->view('widgets/filter/tableDataset', array('dataset' => $dataset)); ?>
-</div>
+		$(".select-filter-operation-value").keyup(function() {
+			$("#filterForm").submit();
+		});
+
+	});
+</script>
+<body>
+	<form id="filterForm" method="POST" action="<?php echo current_url(); ?>">
+		<div>
+			<?php FilterWidget::loadViewSelectFields($listFields); ?>
+		</div>
+
+		<br>
+
+		<div>
+			<?php FilterWidget::loadViewSelectFilters($metaData); ?>
+		</div>
+
+		<br>
+
+		<div>
+			<?php FilterWidget::loadViewTableDataset($dataset); ?>
+		</div>
+	</form>
+</body>
+<?php
+	$this->load->view('templates/footer');
+?>
@@ -1,14 +1,17 @@
 <div>
 	<?php
-		foreach ($listFields as $key => $value)
+		$selectedFields = FilterWidget::getSelectedFields();
+
+		foreach ($selectedFields as $key => $value)
 		{
-			echo '<input type="button" value="'.$value.'">';
+			echo '<input type="submit" value="'.$value.'" onClick="document.getElementById(\'rmField\').value=\''.$value.'\'">';
 		}
 	?>
+	<input type="hidden" id="rmField" name="rmField" value="">
 </div>
 <div>
 	Add:
-	<select>
+	<select name="addField" onChange="document.getElementById('filterForm').submit()">
 		<option value="">Select a field to add..</option>
 		<?php
 			foreach ($listFields as $key => $value)
@@ -1,59 +1,47 @@
 <div>
+<?php
+	$selectedFilters = FilterWidget::getSelectedFilters();
+
+	for ($filtersCounter = 0; $filtersCounter < count($selectedFilters); $filtersCounter++)
+	{
+		$selectedFilter = $selectedFilters[$filtersCounter];
+
+		$md = FilterWidget::getFilterMetaData($selectedFilter, $metaData);
+?>
+		<div>
+
+			<span>
+				<?php echo $md->name; ?>
+			</span>
+
+			<?php echo FilterWidget::renderFilterType($md); ?>
+
+			<span>
+				<input type="submit" value="X" class="remove-filter" filterToRemove="<?php echo $md->name; ?>">
+			</span>
+
+		</div>
+<?php
+	}
+?>
+	<input type="hidden" id="rmFilter" name="rmFilter" value="">
+</div>
+<div>
+	<span>
+		Add filter:
+	</span>
+	<span>
+		<select id="addFilter" name="addFilter">
+			<option value="">Select a field to add...</option>
 	<?php
-		foreach ($metaData as $key => $value)
+		for ($listFieldsCounter = 0; $listFieldsCounter < count($listFields); $listFieldsCounter++)
 		{
-			echo '<div>';
-			echo $value->name;
-
-			if ($value->type == 'int4')
-			{
+			$field = $listFields[$listFieldsCounter];
 	?>
-				<select>
-					<option value="">=</option>
-					<option value="">!=</option>
-					<option value="">>=</option>
-					<option value=""><=</option>
-				</select>
-				<input type="number" value="" name="">
-				<input type="button" value="X" name="">
-
+			<option value="<?php echo $field; ?>"><?php echo $field; ?></option>
 	<?php
-			}
-			elseif ($value->type == 'varchar')
-			{
-	?>
-				<select>
-					<option value="">contains</option>
-					<option value="">does not contain</option>
-				</select>
-				<input type="text" value="" name="">
-				<input type="button" value="X" name="">
-	<?php
-			}
-			elseif ($value->type == 'bool')
-			{
-	?>
-				<select>
-					<option value="">is true</option>
-					<option value="">is false</option>
-				</select>
-				<input type="button" value="X" name="">
-	<?php
-			}
-
-			echo '</div>';
 		}
 	?>
-</div>
-<div>
-	Add filter:
-	<select>
-		<option value="">Select a field to add..</option>
-		<?php
-			foreach ($metaData as $key => $value)
-			{
-				echo '<option value="'.$value->name.'">'.$value->name.'</option>';
-			}
-		?>
-	</select>
+		</select>
+	</span>
 </div>
@@ -1,48 +1,43 @@
-<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
+<?php
+	$result = $dataset->retval;

-<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
-<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
-
-<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
-<link href="../../skin/jquery-ui-1.9.2.custom.min.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-
-<script>
-	$(document).ready(function() {
-
-		$("#t0").tablesorter({
-			widgets: ["zebra"]
-		});
-
-	});
-</script>
+	$selectedFields = FilterWidget::getSelectedFields();
+?>

 <div>
-	<table class="tablesorter" id="t0">
+	<table class="tablesorter" id="tableDataset">
 		<thead>
 			<tr>
-				<th title="PersonId">PersonId</th>
-				<th title="Nachname">Nachname</th>
-				<th title="Vorname">Vorname</th>
-				<th title="Email">Email</th>
-				<th title="Aktiv">Aktiv</th>
+			<?php
+				foreach ($selectedFields as $key => $value)
+				{
+					if (array_key_exists($value, $result[0]))
+					{
+			?>
+					<th title="<?php echo $value; ?>"><?php echo $value; ?></th>
+			<?php
+					}
+				}
+			?>
 			</tr>
 		</thead>
 		<tbody>
 			<?php
-				$result = $dataset->retval;
 				foreach ($result as $key => $value)
 				{
+					echo "<tr>";
+
+					foreach ($selectedFields as $key2 => $value2)
+					{
+						if (array_key_exists($value2, $value))
+						{
 			?>
-					<tr>
-						<td><?php echo $value->PersonId; ?></td>
-						<td><?php echo $value->Nachname; ?></td>
-						<td><?php echo $value->Vorname; ?></td>
-						<td><?php echo $value->Email; ?></td>
-						<td><?php echo $value->Aktiv === true ? 'True' : 'False'; ?></td>
-					</tr>
+						<td><?php echo $value->{$value2}; ?></td>
 			<?php
+						}
+					}
+
+					echo "</tr>";
 				}
 			?>
 		</tbody>
@@ -5,7 +5,33 @@
 */
 class FilterWidget extends Widget
 {
+	const APP_PARAMETER = 'app';
+	const QUERY_PARAMETER = 'query';
+	const DATASET_NAME_PARAMETER = 'datasetName';
+
+	const DATASET_PARAMETER = 'dataset';
+	const METADATA_PARAMETER = 'metaData';
+	const LIST_FIELDS_PARAMETER = 'listFields';
+
+	const WIDGET_URL_FILTER = 'widgets/filter/filter';
+	const WIDGET_URL_SELECT_FIELDS = 'widgets/filter/selectFields';
+	const WIDGET_URL_TABLE_DATASET = 'widgets/filter/tableDataset';
+	const WIDGET_URL_SELECT_FILTERS = 'widgets/filter/selectFilters';
+
+	const SESSION_NAME = 'FILTER';
+
+	const SELECTED_FIELDS = 'selectedFields';
+	const SELECTED_FILTERS = 'selectedFilters';
+	const ACTIVE_FILTERS = 'activeFilters';
+
+	const CMD_ADD_FILTER = 'addFilter';
+	const CMD_REMOVE_FILTER = 'rmFilter';
+	const CMD_ADD_FIELD = 'addField';
+	const CMD_REMOVE_FIELD = 'rmField';
+	const CMD_APPLY_FILTERS = 'applyFilters';
+
 	private $app;
+	private $query;
 	private $datasetName;

 	/**
@@ -13,7 +39,14 @@ class FilterWidget extends Widget
 	 */
 	public function __construct($name, $args = array())
 	{
-		parent::__construct($name, $args);
+		parent::__construct($name, $args); //
+
+		$this->_initFilterWidget($args); //
+
+		$this->_initSession(); //
+
+		//
+		$this->load->model('system/Filters_model', 'FiltersModel');
 	}

 	/**
@@ -21,52 +54,441 @@ class FilterWidget extends Widget
 	 */
 	public function display($widgetData)
 	{
-		$this->load->model('system/Filters_model', 'FiltersModel');
+		//
+		$this->_setSessionFilterData();

-		$this->app = $widgetData['app'];
-		$this->datasetName = $widgetData['datasetName'];
-
-		$dataset = $this->FiltersModel->execReadOnlyQuery($widgetData['query']);
+		//
+		$dataset = $this->FiltersModel->execReadOnlyQuery($this->_generateQuery());

+		//
 		$listFields = $this->FiltersModel->getExecutedQueryListFields();

+		//
 		$metaData = $this->FiltersModel->getExecutedQueryMetaData();

+		//
 		$this->loadViewFilters($listFields, $metaData, $dataset);
 	}

 	/**
 	 *
 	 */
-	private function loadViewFilters($listFields, $metaData, $dataset)
+	public static function getSelectedFields()
 	{
+		return self::_getFromSession(self::SELECTED_FIELDS);
+	}
+
+	/**
+	 *
+	 */
+	public static function getSelectedFilters()
+	{
+		return self::_getFromSession(self::SELECTED_FILTERS);
+	}
+
+	/**
+	 *
+	 */
+	public static function loadViewTableDataset($dataset)
+	{
+		self::_loadView(self::WIDGET_URL_TABLE_DATASET, array(self::DATASET_PARAMETER => $dataset));
+	}
+
+	/**
+	 *
+	 */
+	public static function loadViewSelectFilters($metaData)
+	{
+		self::_loadView(self::WIDGET_URL_SELECT_FILTERS, array(self::METADATA_PARAMETER => $metaData));
+	}
+
+	/**
+	 *
+	 */
+	public static function loadViewSelectFields($listFields)
+	{
+		self::_loadView(self::WIDGET_URL_SELECT_FIELDS, array(self::LIST_FIELDS_PARAMETER => $listFields));
+	}
+
+	/**
+	 *
+	 */
+	public static function getFilterMetaData($filter, $metaData)
+	{
+		$md = null;
+
+		for ($metaDataCounter = 0; $metaDataCounter < count($metaData); $metaDataCounter++)
+		{
+			if ($metaData[$metaDataCounter]->name == $filter)
+			{
+				$md = $metaData[$metaDataCounter];
+				break;
+			}
+		}
+
+		return $md;
+	}
+
+	/**
+	 *
+	 */
+	public static function renderFilterType($filterMetaData)
+	{
+		$html = '';
+		$value = self::_getActiveFilterValue($filterMetaData->name);
+
+		if ($filterMetaData->type == 'int4')
+		{
+			$html = '
+				<span>
+					<select name="%s" class="select-filter-operation">
+						<option value="A">equal</option>
+						<option value="B">not equal</option>
+						<option value="C">greater than</option>
+						<option value="D">less than</option>
+					</select>
+				</span>
+				<span>
+					<input type="number" name="%s" value="%s" class="select-filter-operation-value">
+				</span>
+			';
+		}
+		elseif ($filterMetaData->type == 'varchar')
+		{
+			$html = '
+				<span>
+					<select name="%s" class="select-filter-operation">
+						<option value="A">contains</option>
+						<option value="B">does not contain</option>
+					</select>
+				</span>
+				<span>
+					<input type="text" name="%s" value="%s" class="select-filter-operation-value">
+				</span>
+			';
+		}
+		elseif ($filterMetaData->type == 'bool')
+		{
+			$html = '
+				<span>
+					<select name="%s" class="select-filter-operation">
+						<option value="true">is true</option>
+						<option value="false">is false</option>
+					</select>
+				</span>
+				<span>
+					<input type="hidden" name="%s" value="%s">
+				</span>
+			';
+		}
+
+		return sprintf($html, $filterMetaData->name.'-operation', $filterMetaData->name, $value);
+	}
+
+	/**
+	 *
+	 */
+	protected function loadViewFilters($listFields, $metaData, $dataset)
+	{
+		// Loads views
 		$this->view(
-			'widgets/filter/filter',
-			array('listFields' => $listFields, 'metaData' => $metaData, 'dataset' => $dataset)
+			self::WIDGET_URL_FILTER,
+			array(
+				self::DATASET_PARAMETER => $dataset,
+				self::METADATA_PARAMETER => $metaData,
+				self::LIST_FIELDS_PARAMETER => $listFields
+			)
 		);
 	}

 	/**
 	 *
 	 */
-	private function loadViewSelectFields($listFields)
+	private static function _getFromSession($key)
 	{
-		$this->view('widgets/filter/selectFields', array('listFields' => $listFields));
+		$_getFromSession = null;
+		$ci =& get_instance();
+		$filterSessionArray = $ci->session->userdata(self::SESSION_NAME);
+
+		if (isset($filterSessionArray[$key]))
+		{
+			$_getFromSession = $filterSessionArray[$key];
+		}
+
+		return $_getFromSession;
 	}

 	/**
 	 *
 	 */
-	private function loadViewSelectFilters($metaData)
+	private static function _getActiveFilterValue($filterName)
 	{
-		$this->view('widgets/filter/selectFilters', array('metaData' => $metaData));
+		$getActiveFilterValue = '';
+
+		$activeFields = self::_getFromSession(self::ACTIVE_FILTERS);
+
+		if (isset($activeFields[$filterName]))
+		{
+			$getActiveFilterValue = $activeFields[$filterName];
+		}
+
+		return $getActiveFilterValue;
 	}

 	/**
 	 *
 	 */
-	private function loadViewTableDataset($dataset)
+	private static function _loadView($viewName, $parameters)
 	{
-		$this->view('widgets/filter/tableDataset', array('dataset' => $dataset));
+		$ci =& get_instance();
+		$ci->load->view($viewName, $parameters);
+	}
+
+	/**
+	 *
+	 */
+	private function _initSession()
+	{
+		$filterSessionArray = array();
+
+		if (isset($_SESSION[self::SESSION_NAME]))
+		{
+			$filterSessionArray = $_SESSION[self::SESSION_NAME];
+		}
+
+		if (!isset($filterSessionArray[self::SELECTED_FIELDS]))
+		{
+			$filterSessionArray[self::SELECTED_FIELDS] = array();
+		}
+
+		if (!isset($filterSessionArray[self::SELECTED_FILTERS]))
+		{
+			$filterSessionArray[self::SELECTED_FILTERS] = array();
+		}
+
+		if (!isset($filterSessionArray[self::ACTIVE_FILTERS]))
+		{
+			$filterSessionArray[self::ACTIVE_FILTERS] = array();
+		}
+
+		$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+	}
+
+	/**
+	 *
+	 */
+	private function _initFilterWidget($args)
+	{
+		if (is_array($args) && count($args) > 0)
+		{
+			if (isset($args[self::APP_PARAMETER]))
+			{
+				$this->app = $args[self::APP_PARAMETER];
+			}
+			else
+			{
+				show_error('The "'.self::APP_PARAMETER.'" parameter must be specified');
+			}
+
+			if (isset($args[self::DATASET_NAME_PARAMETER]))
+			{
+				$this->datasetName = $args[self::DATASET_NAME_PARAMETER];
+			}
+			else
+			{
+				show_error('The "'.self::DATASET_NAME_PARAMETER.'" parameter must be specified');
+			}
+
+			if (isset($args[self::QUERY_PARAMETER]))
+			{
+				$this->query = $args[self::QUERY_PARAMETER];
+			}
+			else
+			{
+				show_error('The "'.self::QUERY_PARAMETER.'" parameter must be specified');
+			}
+		}
+		else
+		{
+			show_error('Second parameter must be an associative array');
+		}
+	}
+
+	/**
+	 *
+	 */
+	private function _getSelectedFieldsFromPost()
+	{
+		// Selected fields
+		$selectedFields = array();
+
+		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+		if (isset($filterSessionArray[self::SELECTED_FIELDS]))
+		{
+			$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
+		}
+
+		if (is_array($_POST))
+		{
+			if (array_key_exists(self::CMD_ADD_FIELD, $_POST) && trim($_POST[self::CMD_ADD_FIELD]) != '')
+			{
+				if (!in_array($_POST[self::CMD_ADD_FIELD], $selectedFields))
+				{
+					$selectedFields[] = $_POST[self::CMD_ADD_FIELD];
+				}
+			}
+
+			if (array_key_exists(self::CMD_REMOVE_FIELD, $_POST) && trim($_POST[self::CMD_REMOVE_FIELD]) != '')
+			{
+				$tmpArray = array();
+				foreach ($selectedFields as $key => $value)
+				{
+					if ($_POST[self::CMD_REMOVE_FIELD] != $value)
+					{
+						$tmpArray[] = $value;
+					}
+				}
+
+				$selectedFields = $tmpArray;
+			}
+		}
+
+		return $selectedFields;
+	}
+
+	/**
+	 *
+	 */
+	private function _getSelectedFiltersFromPost()
+	{
+		// Selected filters
+		$selectedFilters = array();
+		$activeFilters = array();
+
+		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+
+		if (isset($filterSessionArray[self::SELECTED_FILTERS]))
+		{
+			$selectedFilters = $filterSessionArray[self::SELECTED_FILTERS];
+		}
+
+		if (isset($filterSessionArray[self::ACTIVE_FILTERS]))
+		{
+			$activeFilters = $filterSessionArray[self::ACTIVE_FILTERS];
+		}
+
+		if (is_array($_POST))
+		{
+			if (array_key_exists(self::CMD_ADD_FILTER, $_POST) && trim($_POST[self::CMD_ADD_FILTER]) != '')
+			{
+				if (!in_array($_POST[self::CMD_ADD_FILTER], $selectedFilters))
+				{
+					$selectedFilters[] = $_POST[self::CMD_ADD_FILTER];
+				}
+			}
+
+			if (array_key_exists(self::CMD_REMOVE_FILTER, $_POST) && trim($_POST[self::CMD_REMOVE_FILTER]) != '')
+			{
+				$tmpArray = array();
+				foreach ($selectedFilters as $key => $value)
+				{
+					if ($_POST[self::CMD_REMOVE_FILTER] != $value)
+					{
+						$tmpArray[] = $value;
+					}
+				}
+
+				$selectedFilters = $tmpArray;
+
+				if (isset($activeFilters[$_POST[self::CMD_REMOVE_FILTER]]))
+				{
+
+				}
+			}
+		}
+
+		return $selectedFilters;
+	}
+
+	/**
+	 *
+	 */
+	private function _getActiveFiltersFromPost()
+	{
+		// Selected fields
+		$activeFilters = array();
+		$selectedFilters = array();
+
+		$filterSessionArray = $this->session->userdata(self::SESSION_NAME);
+
+		if (isset($filterSessionArray[self::ACTIVE_FILTERS]))
+		{
+			$activeFilters = $filterSessionArray[self::ACTIVE_FILTERS];
+		}
+
+		if (isset($filterSessionArray[self::SELECTED_FILTERS]))
+		{
+			$selectedFilters = $filterSessionArray[self::SELECTED_FILTERS];
+		}
+
+		if (is_array($_POST))
+		{
+			for ($selectedFiltersCounter = 0; $selectedFiltersCounter < count($selectedFilters); $selectedFiltersCounter++)
+			{
+				$selectedFilter = $selectedFilters[$selectedFiltersCounter];
+
+				if (isset($_POST[$selectedFilter]))
+				{
+					$activeFilters[$selectedFilter] = $_POST[$selectedFilter];
+				}
+			}
+		}
+
+		return $activeFilters;
+	}
+
+	/**
+	 *
+	 */
+	private function _setSessionFilterData()
+	{
+		$filterSessionArray = array(
+			self::SELECTED_FIELDS => $this->_getSelectedFieldsFromPost(),
+			self::SELECTED_FILTERS => $this->_getSelectedFiltersFromPost(),
+			self::ACTIVE_FILTERS => $this->_getActiveFiltersFromPost(),
+		);
+
+		$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
+	}
+
+	/**
+	 *
+	 */
+	private function _generateQuery()
+	{
+		$query = $this->query;
+		// Filters dataset
+		if (is_array($_POST)
+			&& array_key_exists(self::CMD_APPLY_FILTERS, $_POST)
+			&& $_POST[self::CMD_APPLY_FILTERS] == 'true')
+		{
+			if (is_array($_POST) && array_key_exists(self::SELECTED_FILTERS, $_POST))
+			{
+				$selectedFilters = $_POST[self::SELECTED_FILTERS];
+			}
+
+			for ($filtersCounter = 0; $filtersCounter < count($selectedFilters); $filtersCounter++)
+			{
+				$selectedFilter = $selectedFilters[$filtersCounter];
+
+				if (isset($_POST[$selectedFilter]))
+				{
+				}
+			}
+
+			$query = 'SELECT * FROM ('.$this->query.') tableFilters WHERE "Vorname" ILIKE \'%Oliver%\'';
+		}
+
+		return $query;
 	}
 }