blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-05 14:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
Gerald Raab
2018-04-12 12:13:03 +02:00
parent baf6503f2f 307c8a44f1
commit 3505b13bcf
4 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/widgets/filter/filter.php
+25 -8
View File
@@ -1,5 +1,11 @@
<style>
.filter-options-span {
display: inline-block;
width: 130px;
font-weight: bold;
}
.filter-name-title {
font-family: inherit;
font-size: 16px;
@@ -69,26 +75,37 @@
.select-filter-option {
display: inline;
width: 90px;
width: 100px;
}
#addField {
#addField, #customFilterDescription, #addFilter {
display: inline;
width: 400px;
width: 535px;
}
#addFilter {
display: inline;
width: 400px;
margin-right: 12px;
}
#selectedFilters {
margin-bottom: 20px;
}
#customFilterDescription {
display: inline;
width: 400px;
#applyFilter, #saveCustomFilterButton, .remove-selected-filter {
font-weight: bold;
}
.remove-selected-filter {
padding-bottom: 3px;
}
.panel-title {
font-weight: bold;
padding-top: 3px;
}
.remove-field {
font-weight: bold;
}
</style>
application/views/widgets/filter/saveFilter.php
+8 -1
View File
@@ -30,12 +30,19 @@
</script>
<br>
<div>
<span class="filter-options-span">
Filter description:
</span>
<span>
Filter description: <input type="text" id="customFilterDescription" value="">
<input type="text" id="customFilterDescription" value="">
</span>
<span>
<input type="button" id="saveCustomFilterButton" value="Save filter">
</span>
</div>
<br>
application/views/widgets/filter/selectFields.php
+1 -1
View File
@@ -232,7 +232,7 @@
<div id="filterSelectFieldsDnd" class="filter-select-fields-dnd-div"></div>
<div>
<span>
<span class="filter-options-span">
Add field:
</span>
application/views/widgets/filter/selectFilters.php
+14 -12
View File
@@ -120,7 +120,7 @@
if (metaData.type.toLowerCase().indexOf("int") >= 0)
{
html = '<span>';
html += ' <select class="select-filter-operation form-control">';
html += ' <select class="form-control select-filter-operation">';
html += ' <option value="equal" ' + (activeFiltersOperation == "equal" ? "selected" : "") + '>equal</option>';
html += ' <option value="nequal" ' + (activeFiltersOperation == "nqual" ? "selected" : "") + '>not equal</option>';
html += ' <option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
@@ -128,37 +128,37 @@
html += ' </select>';
html += '</span>';
html += '<span>';
html += ' <input type="number" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
html += ' <input type="number" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
html += '</span>';
}
if (metaData.type.toLowerCase().indexOf('varchar') >= 0)
if (metaData.type.toLowerCase().indexOf('varchar') >= 0 || metaData.type.toLowerCase() == 'text')
{
html = '<span>';
html += ' <select class="select-filter-operation form-control">';
html += ' <select class="form-control select-filter-operation">';
html += ' <option value="contains" ' + (activeFiltersOperation == "contains" ? "selected" : "") + '>contains</option>';
html += ' <option value="ncontains" ' + (activeFiltersOperation == "ncontains" ? "selected" : "") + '>does not contain</option>';
html += ' </select>';
html += '</span>';
html += '<span>';
html += ' <input type="text" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
html += ' <input type="text" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
html += '</span>';
}
if (metaData.type.toLowerCase().indexOf('bool') >= 0)
{
html = '<span>';
html += ' <select class="select-filter-operation form-control">';
html += ' <select class="form-control select-filter-operation">';
html += ' <option value="true" ' + (activeFiltersOperation == "true" ? "selected" : "") + '>is true</option>';
html += ' <option value="false" ' + (activeFiltersOperation == "false" ? "selected" : "") + '>is false</option>';
html += ' </select>';
html += '</span>';
html += '<span>';
html += ' <input type="hidden" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
html += ' <input type="hidden" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
html += '</span>';
}
if (metaData.type.toLowerCase().indexOf('timestamp') >= 0 || metaData.type.toLowerCase().indexOf('date') >= 0)
{
var classOperation = 'select-filter-operation-value form-control';
var classOption = 'select-filter-option form-control';
var classOperation = 'form-control select-filter-operation-value';
var classOption = 'form-control select-filter-option';
var disabled = "";
if (activeFiltersOperation == "set" || activeFiltersOperation == "nset")
@@ -169,7 +169,7 @@
}
html = '<span>';
html += ' <select class="select-filter-operation form-control">';
html += ' <select class="form-control select-filter-operation">';
html += ' <option value="lt" ' + (activeFiltersOperation == "lt" ? "selected" : "") + '>less than</option>';
html += ' <option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
html += ' <option value="set" ' + (activeFiltersOperation == "set" ? "selected" : "") + '>is set</option>';
@@ -215,7 +215,7 @@
{
var selectedFilters = '<div>';
selectedFilters += '<span>';
selectedFilters += '<span class="filter-options-span">';
selectedFilters += data.selectedFiltersAliases[i];
selectedFilters += '</span>';
@@ -272,10 +272,12 @@
</script>
<br>
<div id="selectedFilters"></div>
<div>
<span>
<span class="filter-options-span">
Add filter:
</span>