blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 17:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes to the FilterWidget II

Browse Source
This commit is contained in:
Paolo
2018-06-04 17:23:40 +02:00
parent 0a71bce547
commit 20bffadbc4
6 changed files with 480 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Filters.php
-73
View File
@@ -82,79 +82,6 @@ class Filters extends FHC_Controller
}
}
// /**
// *
// */
// public function getFields()
// {
// $json = new stdClass();
//
// $json->fields = $this->filterslib->getElementSession(FiltersLib::SESSION_FIELDS);
// $json->selectedFields = $this->filterslib->getElementSession(FiltersLib::SESSION_SELECTED_FIELDS);
// $json->columnsAliases = $this->filterslib->getElementSession(FiltersLib::SESSION_COLUMNS_ALIASES);
//
// $this->outputJsonSuccess($json);
// }
//
// /**
// *
// */
// public function getFilters()
// {
// $json = new stdClass();
//
// $session = $this->_readSession($this->_getFilterUniqueId());
//
// $json->allSelectedFields = $this->_getFromSession('allSelectedFields');
// $json->allColumnsAliases = $this->_getFromSession('allColumnsAliases');
//
// $json->selectedFilters = $this->_getFromSession('selectedFilters');
// $json->selectedFiltersAliases = array();
// $json->selectedFiltersMetaData = array();
//
// $json->selectedFiltersActiveFilters = array();
// $json->selectedFiltersActiveFiltersOperation = array();
// $json->selectedFiltersActiveFiltersOption = array();
//
// $metaData = $this->_getFromSession('metaData');
// $activeFilters = $this->_getFromSession('activeFilters');
// $activeFiltersOperation = $this->_getFromSession('activeFiltersOperation');
// $activeFiltersOption = $this->_getFromSession('activeFiltersOption');
//
// for ($i = 0; $i < count($json->selectedFilters); $i++)
// {
// $pos = array_search($json->selectedFilters[$i], $json->allSelectedFields);
//
// if ($pos !== false)
// {
// $json->selectedFiltersAliases[$i] = $json->selectedFilters[$i];
// if ($json->allColumnsAliases != null && is_array($json->allColumnsAliases))
// {
// $json->selectedFiltersAliases[$i] = $json->allColumnsAliases[$pos];
// }
//
// $json->selectedFiltersMetaData[] = $metaData[$pos];
//
// if (isset($activeFilters[$json->selectedFilters[$i]]))
// {
// $json->selectedFiltersActiveFilters[] = $activeFilters[$json->selectedFilters[$i]];
// }
//
// if (isset($activeFiltersOperation[$json->selectedFilters[$i]]))
// {
// $json->selectedFiltersActiveFiltersOperation[] = $activeFiltersOperation[$json->selectedFilters[$i]];
// }
//
// if (isset($activeFiltersOption[$json->selectedFilters[$i]]))
// {
// $json->selectedFiltersActiveFiltersOption[] = $activeFiltersOption[$json->selectedFilters[$i]];
// }
// }
// }
//
// $this->output->set_content_type('application/json')->set_output(json_encode($json));
// }
//
// /**
// *
// */
application/views/widgets/filter/saveFilter.php
+2 -2
View File
@@ -1,11 +1,11 @@
<br>
<div>
<span class="filter-options-span">
<span class="filter-span-label">
Filter description:
</span>
<span>
<input type="text" id="customFilterDescription" value="">
<input type="text" id="customFilterDescription" class="input-text-custom-filter" value="">
</span>
<span>
application/views/widgets/filter/selectFields.php
+5 -3
View File
@@ -1,11 +1,13 @@
<div id="filterSelectFieldsDnd" class="filter-select-fields-dnd-div"></div>
<div id="dragAndDropFieldsArea" class="drag-and-drop-fields-area"></div>
<div>
<span class="filter-options-span">
<span class="filter-span-label">
Add field:
</span>
<span>
<select id="addField"></select>
<select id="addField" class="drop-down-fields">
<option value="">Select a field to add...</option>
</select>
</span>
</div>
application/views/widgets/filter/selectFilters.php
+5 -3
View File
@@ -1,14 +1,16 @@
<br>
<div id="selectedFilters"></div>
<div id="appliedFilters"></div>
<div>
<span class="filter-options-span">
<span class="filter-span-label">
Add filter:
</span>
<span>
<select id="addFilter"></select>
<select id="addFilter" class="drop-down-filters">
<option value="">Select a filter to add...</option>
</select>
</span>
<span>
public/css/FilterWidget.css
+32 -32
View File
@@ -1,30 +1,30 @@
.filter-options-span {
display: inline-block;
width: 130px;
font-weight: bold;
}
.filter-name-title {
font-family: inherit;
font-size: 16px;
/*font-weight: bold;*/
line-height: 1.1;
color: black;
}
.panel-title {
font-weight: bold;
padding-top: 3px;
}
.filters-hidden-panel {
margin: 0 10px 10px 10px;
}
.hidden-control {
display: none !important;
.filter-span-label {
display: inline-block;
width: 130px;
font-weight: bold;
}
.filter-select-fields-dnd-div {
.drag-and-drop-fields-area {
height: 50px;
}
.filter-select-field-dnd-span {
.drag-and-drop-fields-span {
border: 1px solid black;
border-radius: 7px;
margin-left: 3px;
@@ -33,14 +33,23 @@
top: 10px;
}
.filter-select-field-dnd-span:hover {
.drag-and-drop-fields-span:hover {
cursor: move;
}
.filter-select-field-dnd-span a {
.remove-selected-field {
font-weight: bold;
cursor: pointer;
}
.remove-selected-field:hover {
text-decoration: none;
}
.hidden-control {
display: none !important;
}
.selection-before::before {
content: "";
position: absolute;
@@ -61,47 +70,38 @@
border-right: 2px solid #428bca;
}
.select-filter-operation {
.applied-filter-operation {
display: inline;
width: 130px;
}
.select-filter-operation-value {
.applied-filter-condition {
display: inline;
width: 400px;
}
.select-filter-option {
.applied-filter-option {
display: inline;
width: 100px;
}
#addField, #customFilterDescription, #addFilter {
.remove-applied-filter {
padding-bottom: 3px;
}
.drop-down-fields, .drop-down-filters, .input-text-custom-filter {
display: inline;
width: 535px;
}
#selectedFilters {
#appliedFilters {
margin-bottom: 20px;
}
#applyFilter, #saveCustomFilterButton, .remove-selected-filter {
#applyFilter, #saveCustomFilterButton, .remove-applied-filter {
font-weight: bold;
}
#applyFilter, #saveCustomFilterButton {
width: 100px;
}
.remove-selected-filter {
padding-bottom: 3px;
}
.panel-title {
font-weight: bold;
padding-top: 3px;
}
.remove-field {
font-weight: bold;
}
public/js/FilterWidget.js
+436 -428
View File
File diff suppressed because it is too large Load Diff