Skip to content

Commit a4208e9

Browse files
committed
show the current filter values
1 parent 28206e7 commit a4208e9

File tree

3 files changed

+42
-2
lines changed

3 files changed

+42
-2
lines changed

index.html

+1
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ <h5 class="modal-title">Share URL</h5>
275275
</div>
276276
<button id="btnRemoveFilter" class="btn btn-secondary">Remove filter</button>
277277
<button id="btnApplyFilter" class="btn btn-warning">Apply filter</button>
278+
<p class="btn-secondary" id="filterOutput"><span id="filterText"></span></p>
278279
</div>
279280
</script>
280281

src/js/app.js

+32-2
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,8 @@ function updateOperator(evt){
16791679
var filterTask = bootleaf.filterTasks.find(x => x.layerId === layerId);
16801680
var filter = filterTask.filters.find(x => x.name === fieldName);
16811681
filter.operator = evt.target.value;
1682-
console.log("update operator", filter)
1682+
console.log("update operator", filter);
1683+
updateFilterText();
16831684
}
16841685

16851686
function updateValue(evt){
@@ -1692,7 +1693,8 @@ function updateValue(evt){
16921693
var operator = $("#filterWidgetOperator option:selected").val();
16931694
filter.operator = operator;
16941695
}
1695-
console.log("update value", filter)
1696+
console.log("update value", filter);
1697+
updateFilterText();
16961698
}
16971699

16981700
function updateFilterParams(control){
@@ -1726,6 +1728,7 @@ function updateFilterParams(control){
17261728
}
17271729
}
17281730

1731+
updateFilterText();
17291732
}
17301733

17311734
function updateFilterOperator(option){
@@ -1764,6 +1767,32 @@ function updateFilterOperator(option){
17641767
});
17651768
$("#filterWidgetOperator").append(operatorOptions);
17661769

1770+
updateFilterText();
1771+
}
1772+
1773+
function updateFilterText(){
1774+
var layerId = $("#filterWidgetLayer option:selected").val()
1775+
var filterTask = bootleaf.filterTasks.find(x => x.layerId === layerId);
1776+
var filterText;
1777+
for (var i = 0; i < filterTask.filters.length; i++){
1778+
var filter = filterTask.filters[i];
1779+
if (filter.operator && filter.value) {
1780+
if (!filterText) {
1781+
filterText = filter.alias + " " + filter.operator + " " + filter.value;
1782+
} else {
1783+
filterText += " and " + filter.alias + " " + filter.operator + " " + filter.value;
1784+
}
1785+
$("#filterText").html(filterText);
1786+
console.log("update filter text", filter)
1787+
}
1788+
}
1789+
1790+
if (filterText !== undefined){
1791+
applyFilter();
1792+
} else {
1793+
$("#filterOutput").hide();
1794+
}
1795+
17671796
}
17681797

17691798
function applyFilter() {
@@ -1880,6 +1909,7 @@ function applyFilter() {
18801909
}
18811910
}
18821911

1912+
$("#filterOutput").show();
18831913
}
18841914

18851915
function removeFilter() {

style.css

+9
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,12 @@ div.dataTables_wrapper div.dataTables_paginate {
7777
.leaflet-draw-toolbar .leaflet-draw-draw-circlemarker {
7878
display: none;
7979
}
80+
81+
#filterOutput {
82+
margin-top: 15px;
83+
font-style: italic;
84+
font-size: 14px;
85+
color: white;
86+
padding: 15px;
87+
display: none;
88+
}

0 commit comments

Comments
 (0)