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

- When the apply button is click it is checked that the conditions are

Browse Source 
not empty, in case the filter is not applied and the empty conditions
  are marked
- Added new type bpchar to the conditions
This commit is contained in:
Paolo
2021-10-20 12:54:00 +02:00
parent 458cd6ae0c
commit 6dfabf31fb
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/FilterWidget.js
+38 -16
View File
@@ -505,33 +505,51 @@ var FHC_FilterWidget = {
*/
_applyFilterEvent: function() {
var isValid = true;
var appliedFilters = [];
var appliedFiltersOperations = [];
var appliedFiltersConditions = [];
var appliedFiltersOptions = [];
// Get all the data from the filter form and fill the arrays
$("#appliedFilters > div").each(function(i, e) {
appliedFilters.push($(this).find(".hidden-field-name").val());
appliedFiltersOperations.push($(this).find(".applied-filter-operation").val());
appliedFiltersConditions.push($(this).find(".applied-filter-condition:enabled").val());
// Checks if the conditions are filled by the user
if ($(this).find(".applied-filter-condition:enabled").length > 0
&& $(this).find(".applied-filter-condition:enabled").val().trim() != '')
{
appliedFiltersConditions.push($(this).find(".applied-filter-condition:enabled").val());
}
else // otherwise mark the empty conditions in red
{
$(this).find(".applied-filter-condition:enabled").css("border", "1px solid red");
isValid = false;
}
appliedFiltersOptions.push($(this).find(".applied-filter-option:enabled").val());
});
FHC_AjaxClient.ajaxCallPost(
"widgets/Filters/applyFilters",
{
appliedFilters: appliedFilters,
appliedFiltersOperations: appliedFiltersOperations,
appliedFiltersConditions: appliedFiltersConditions,
appliedFiltersOptions: appliedFiltersOptions,
filterUniqueId: FHC_FilterWidget.getFilterUniqueIdPrefix()
},
{
successCallback: function(data, textStatus, jqXHR) {
FHC_FilterWidget._failOrReload(data, textStatus, jqXHR);
if (isValid)
{
FHC_AjaxClient.ajaxCallPost(
"widgets/Filters/applyFilters",
{
appliedFilters: appliedFilters,
appliedFiltersOperations: appliedFiltersOperations,
appliedFiltersConditions: appliedFiltersConditions,
appliedFiltersOptions: appliedFiltersOptions,
filterUniqueId: FHC_FilterWidget.getFilterUniqueIdPrefix()
},
{
successCallback: function(data, textStatus, jqXHR) {
FHC_FilterWidget._failOrReload(data, textStatus, jqXHR);
}
}
}
);
);
}
},
/**
@@ -770,6 +788,8 @@ var FHC_FilterWidget = {
var html = "";
console.log(metaData.type.toLowerCase());
if (metaData.type.toLowerCase().indexOf("int") >= 0)
{
if (appliedFilter.condition == null) appliedFilter.condition = 0;
@@ -786,7 +806,9 @@ var FHC_FilterWidget = {
html += " <input type='numbe' value='" + appliedFilter.condition + "' class='form-control applied-filter-condition'>";
html += "</span>";
}
if (metaData.type.toLowerCase().indexOf("varchar") >= 0 || metaData.type.toLowerCase() == "text")
if (metaData.type.toLowerCase().indexOf("varchar") >= 0
|| metaData.type.toLowerCase().indexOf("text") >= 0
|| metaData.type.toLowerCase().indexOf("bpchar") >= 0)
{
if (appliedFilter.condition == null) appliedFilter.condition = "";