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

- Added new phrase for the filter widget and fixed GUI tranlations

Browse Source 
- Fixed error logs in public/js/FilterWidget.js
- Changed the behavior of the Apply and Save buttons for the FilterWidget
- Changed the GUI aesthetic of the FilterWidget settings
- Added new option reloadPage to the AjaxLib, to reload the page after the complete callback
- Added new classes to the public/css/FilterWidget.css
- Changed FilterWidgetLib->loadDefinition: added a new fallback to find a filter in the database for the currend FilterWidget
- Changed FilterWidgetLib->removeCustomFilter: when a custom filter is removed from the database then it is removed even from the session
- Added new private method _dropFromSessionFilterWidgetById to application/libraries/FilterWidgetLib.php
This commit is contained in:
Paolo
2021-10-19 15:37:44 +02:00
parent 9dcf948e7e
commit 458cd6ae0c
7 changed files with 253 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/FilterWidgetLib.php
+46 -7
View File
@@ -203,7 +203,7 @@ class FilterWidgetLib
// Loops in the session for all the filter widgets // Loops in the session for all the filter widgets
foreach ($filterWidgetsSession as $filterWidget => $filterWidgetData) foreach ($filterWidgetsSession as $filterWidget => $filterWidgetData)
{ {
// If this filter widget is not the currrent used filter widget and the it is expired... // If this filter widget is not the current used filter widget and the it is expired...
if ($this->_filterUniqueId != $filterWidget && $filterWidgetData[self::SESSION_TIMEOUT] <= time()) if ($this->_filterUniqueId != $filterWidget && $filterWidgetData[self::SESSION_TIMEOUT] <= time())
{ {
cleanSessionElement(self::SESSION_NAME, $filterWidget); // ...remove it cleanSessionElement(self::SESSION_NAME, $filterWidget); // ...remove it
@@ -232,7 +232,7 @@ class FilterWidgetLib
if ($filterId != null && is_numeric($filterId) && $filterId > 0) if ($filterId != null && is_numeric($filterId) && $filterId > 0)
{ {
$whereParameters = array( $whereParameters = array(
'filter_id' => $filterId self::FILTER_ID => $filterId
); );
} }
else else
@@ -279,6 +279,18 @@ class FilterWidgetLib
if ($definition == null && $whereParameters != null) if ($definition == null && $whereParameters != null)
{ {
$definition = $this->_ci->FiltersModel->loadWhere($whereParameters); $definition = $this->_ci->FiltersModel->loadWhere($whereParameters);
// Last chance!!!
if (!hasData($definition)) // If no data have been found until now the tries the most desperate query
{
$this->_ci->FiltersModel->addOrder('filter_id', 'ASC'); // sort on column filter_id to get the oldest
$whereParameters = array(
'app' => $app,
'dataset_name' => $datasetName
);
$definition = $this->_ci->FiltersModel->loadWhere($whereParameters);
}
} }
return $definition; return $definition;
@@ -712,8 +724,11 @@ class FilterWidgetLib
{ {
$this->_ci->load->model('system/Filters_model', 'FiltersModel'); // to remove the filter definitions from DB $this->_ci->load->model('system/Filters_model', 'FiltersModel'); // to remove the filter definitions from DB
// delete it! // Delete it from database
$this->_ci->FiltersModel->delete(array('filter_id' => $filterId)); $this->_ci->FiltersModel->delete(array(self::FILTER_ID => $filterId));
// Delete it from session
$this->_dropFromSessionFilterWidgetById($filterId);
$removeCustomFilter = true; $removeCustomFilter = true;
} }
@@ -735,7 +750,7 @@ class FilterWidgetLib
$session = $this->getSession(); // The filter currently stored in session (the one that is currently used) $session = $this->getSession(); // The filter currently stored in session (the one that is currently used)
if ($session != null) if ($session != null)
{ {
// Loads the Fitlers model // Loads the Filters model
$this->_ci->load->model('system/Filters_model', 'FiltersModel'); $this->_ci->load->model('system/Filters_model', 'FiltersModel');
// Loads all the filters related to this page (same dataset_name and same app name) // Loads all the filters related to this page (same dataset_name and same app name)
@@ -761,7 +776,7 @@ class FilterWidgetLib
'%s?%s=%s', '%s?%s=%s',
site_url($navigationPage), site_url($navigationPage),
self::FILTER_ID, self::FILTER_ID,
$filter->filter_id $filter->{self::FILTER_ID}
) // link ) // link
); );
@@ -774,7 +789,7 @@ class FilterWidgetLib
{ {
$menuEntry['subscriptDescription'] = 'Remove'; $menuEntry['subscriptDescription'] = 'Remove';
$menuEntry['subscriptLinkClass'] = 'remove-custom-filter'; $menuEntry['subscriptLinkClass'] = 'remove-custom-filter';
$menuEntry['subscriptLinkValue'] = $filter->filter_id; $menuEntry['subscriptLinkValue'] = $filter->{self::FILTER_ID};
$childrenPersonalArray[] = $menuEntry; // adds to personal filters menu array $childrenPersonalArray[] = $menuEntry; // adds to personal filters menu array
} }
} }
@@ -974,5 +989,29 @@ class FilterWidgetLib
return $pos; return $pos;
} }
/**
* Remove from the session the given filter widget
*/
private function _dropFromSessionFilterWidgetById($filterId)
{
// Loads the session for all the filter widgets
$filterWidgetsSession = getSession(self::SESSION_NAME);
// If something is present in session
if ($filterWidgetsSession != null)
{
// Loops in the session for all the filter widgets
foreach ($filterWidgetsSession as $filterWidget => $filterWidgetData)
{
// If this filter widget is not the one that we are looking for
if ($filterWidgetData[self::FILTER_ID] == $filterId)
{
cleanSessionElement(self::SESSION_NAME, $filterWidget); // ...remove it
break; // stop to search
}
}
}
}
} }
application/views/widgets/filter/filterOptions.php
-2
View File
@@ -21,8 +21,6 @@
<?php FilterWidget::loadViewSelectFilters(); ?> <?php FilterWidget::loadViewSelectFilters(); ?>
</div> </div>
<br>
<!-- Filter save options --> <!-- Filter save options -->
<div> <div>
<?php FilterWidget::loadViewSaveFilter(); ?> <?php FilterWidget::loadViewSaveFilter(); ?>
application/views/widgets/filter/selectFilters.php
+25 -14
View File
@@ -1,17 +1,28 @@
<div class="up-down-border">
<br>
<div>
<span class="filter-span-label">
<?php echo ucfirst($this->p->t('filter', 'filterHinzufuegen')); ?>:
</span>
<span>
<select id="addFilter" class="drop-down-filters"></select>
</span>
</div>
<br>
<div id="appliedFilters"></div>
<div class="margin-left-25">
<span>
<input id="applyFilter" type="button" value="<?php echo ucfirst($this->p->t('filter', 'filterApply')); ?>">
</span>
</div>
<br> <br>
<div id="appliedFilters"></div>
<div>
<span class="filter-span-label">
<?php echo ucfirst($this->p->t('filter', 'filterHinzufuegen')); ?>:
</span>
<span>
<select id="addFilter" class="drop-down-filters"></select>
</span>
<span>
<input id="applyFilter" type="button" value="<?php echo ucfirst($this->p->t('global', 'hinzufuegen')); ?>">
</span>
</div> </div>
public/css/FilterWidget.css
+15 -3
View File
@@ -28,7 +28,6 @@
.drag-and-drop-fields-span { .drag-and-drop-fields-span {
border: 1px solid black; border: 1px solid black;
border-radius: 7px; border-radius: 7px;
/*margin-left: 3px;*/
margin-right: 6px; margin-right: 6px;
margin-bottom: 10px; margin-bottom: 10px;
padding: 5px 10px; padding: 5px 10px;
@@ -130,7 +129,20 @@
color: green; color: green;
} }
#dragAndDropFieldsArea #dragAndDropFieldsArea {
{
display: inline-table !important; display: inline-table !important;
} }
.margin-left-25 {
margin-left: 25%;
}
.up-down-border {
border-top-width: 1px;
border-top-color: #ddd;
border-top-style: solid;
border-bottom-width: 1px;
border-bottom-color: #ddd;
border-bottom-style: solid;
}
public/js/AjaxLib.js
+103 -81
View File
@@ -5,7 +5,7 @@
* @author * @author
* @copyright Copyright (c) 2016 fhcomplete.org * @copyright Copyright (c) 2016 fhcomplete.org
* @license GPLv3 * @license GPLv3
* @link https://fhcomplete.org * @link https://fhcomplete.org
* @since Version 1.0.0 * @since Version 1.0.0
*/ */
@@ -54,7 +54,7 @@ var FHC_AjaxClient = {
* ajaxCallParameters is an object * ajaxCallParameters is an object
*/ */
ajaxCallGet: function(remoteController, controllerParameters, ajaxCallParameters) { ajaxCallGet: function(remoteController, controllerParameters, ajaxCallParameters) {
FHC_AjaxClient._ajaxCall(remoteController, controllerParameters, HTTP_GET_METHOD, ajaxCallParameters); FHC_AjaxClient._ajaxCall(remoteController, controllerParameters, HTTP_GET_METHOD, ajaxCallParameters);
}, },
/** /**
@@ -63,7 +63,7 @@ var FHC_AjaxClient = {
* ajaxCallParameters is an object * ajaxCallParameters is an object
*/ */
ajaxCallPost: function(remoteController, controllerParameters, ajaxCallParameters) { ajaxCallPost: function(remoteController, controllerParameters, ajaxCallParameters) {
FHC_AjaxClient._ajaxCall(remoteController, controllerParameters, HTTP_POST_METHOD, ajaxCallParameters); FHC_AjaxClient._ajaxCall(remoteController, controllerParameters, HTTP_POST_METHOD, ajaxCallParameters);
}, },
/** /**
@@ -72,13 +72,13 @@ var FHC_AjaxClient = {
isSuccess: function(response) { isSuccess: function(response) {
var isSuccess = false; var isSuccess = false;
if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE) && response.hasOwnProperty(RESPONSE)) if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE) && response.hasOwnProperty(RESPONSE))
{ {
if (response.error == SUCCESS) if (response.error == SUCCESS)
{ {
isSuccess = true; isSuccess = true;
} }
} }
return isSuccess; return isSuccess;
}, },
@@ -96,8 +96,8 @@ var FHC_AjaxClient = {
hasData: function(response) { hasData: function(response) {
var hasData = false; var hasData = false;
if (FHC_AjaxClient.isSuccess(response)) if (FHC_AjaxClient.isSuccess(response))
{ {
if ((jQuery.type(response.retval) == "object" && !jQuery.isEmptyObject(response.retval)) if ((jQuery.type(response.retval) == "object" && !jQuery.isEmptyObject(response.retval))
|| (jQuery.isArray(response.retval) && response.retval.length > 0) || (jQuery.isArray(response.retval) && response.retval.length > 0)
|| (jQuery.type(response.retval) == "string" && response.retval.trim() != "") || (jQuery.type(response.retval) == "string" && response.retval.trim() != "")
@@ -105,7 +105,7 @@ var FHC_AjaxClient = {
{ {
hasData = true; hasData = true;
} }
} }
return hasData; return hasData;
}, },
@@ -116,10 +116,10 @@ var FHC_AjaxClient = {
getData: function(response) { getData: function(response) {
var data = null; var data = null;
if (FHC_AjaxClient.hasData(response)) if (FHC_AjaxClient.hasData(response))
{ {
data = response.retval; data = response.retval;
} }
return data; return data;
}, },
@@ -130,10 +130,10 @@ var FHC_AjaxClient = {
getError: function(response) { getError: function(response) {
var error = "Generic error"; var error = "Generic error";
if (jQuery.type(response) == "object" && !jQuery.isEmptyObject(response) && response.hasOwnProperty(RESPONSE)) if (jQuery.type(response) == "object" && !jQuery.isEmptyObject(response) && response.hasOwnProperty(RESPONSE))
{ {
error = response.retval; error = response.retval;
} }
return error; return error;
}, },
@@ -145,9 +145,9 @@ var FHC_AjaxClient = {
var code = 1; // Generic error var code = 1; // Generic error
if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE)) if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE))
{ {
code = response.error; code = response.error;
} }
return code; return code;
}, },
@@ -178,20 +178,20 @@ var FHC_AjaxClient = {
* Retrives parameters from URL query string (HTTP GET parameters) * Retrives parameters from URL query string (HTTP GET parameters)
*/ */
getUrlParameter: function(sParam) { getUrlParameter: function(sParam) {
var sPageURL = decodeURIComponent(window.location.search.substring(1)), var sPageURL = decodeURIComponent(window.location.search.substring(1)),
sURLVariables = sPageURL.split("&"), sURLVariables = sPageURL.split("&"),
sParameterName, sParameterName,
i; i;
for (var i = 0; i < sURLVariables.length; i++) for (var i = 0; i < sURLVariables.length; i++)
{ {
sParameterName = sURLVariables[i].split("="); sParameterName = sURLVariables[i].split("=");
if (sParameterName[0] === sParam) if (sParameterName[0] === sParam)
{ {
return sParameterName[1]; return sParameterName[1];
} }
} }
}, },
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
@@ -259,7 +259,7 @@ var FHC_AjaxClient = {
// Call the error callback saved in _errorCallback property // Call the error callback saved in _errorCallback property
// NOTE: this is not referred to FHC_AjaxClient but to the ajax object // NOTE: this is not referred to FHC_AjaxClient but to the ajax object
this._errorCallback(jqXHR, textStatus, errorThrown); this._errorCallback(jqXHR, textStatus, errorThrown);
}, },
/** /**
@@ -279,6 +279,14 @@ var FHC_AjaxClient = {
} }
FHC_AjaxClient._hideVeil(); // finally hide the veil FHC_AjaxClient._hideVeil(); // finally hide the veil
// If was required a page reload then do it!
if (this._reloadPage === true)
{
// NOTE: to avoid any conflict with other ajaxs calls
// Otherwise some browsers (eg. firefox) can prompt an error
$(document).ajaxStop(function() { location.reload(); });
}
}, },
/** /**
@@ -336,14 +344,14 @@ var FHC_AjaxClient = {
* Instantiate a new object and copy in it the properties from the parameter * Instantiate a new object and copy in it the properties from the parameter
*/ */
_cpObjProps: function(obj) { _cpObjProps: function(obj) {
var returnObj = {}; var returnObj = {};
for (var prop in obj) for (var prop in obj)
{ {
returnObj[prop] = obj[prop]; returnObj[prop] = obj[prop];
} }
return returnObj; return returnObj;
}, },
/** /**
@@ -384,9 +392,9 @@ var FHC_AjaxClient = {
* *
* @param controllerParameters * @param controllerParameters
* Example: { * Example: {
* name1: value, * name1: value,
* name2: value, * name2: value,
* files: $(selector)[0].files --> this is the FileList * files: $(selector)[0].files --> this is the FileList
* } * }
* @returns {boolean} * @returns {boolean}
* @private * @private
@@ -402,10 +410,6 @@ var FHC_AjaxClient = {
return true; return true;
} }
} }
/*
return Object.values(controllerParameters)
.some((value) => value instanceof FileList === true);
*/
}, },
/** /**
@@ -454,7 +458,7 @@ var FHC_AjaxClient = {
*/ */
_checkAndGenerateAjaxParams: function(remoteController, controllerParameters, type, ajaxCallParameters) { _checkAndGenerateAjaxParams: function(remoteController, controllerParameters, type, ajaxCallParameters) {
var valid = true; // by default they are ok (we want to trust you, please do not betray it) var valid = true; // by default they are ok (we want to trust you, please do not betray it)
// Returned parameters // Returned parameters
var ajaxParameters = { var ajaxParameters = {
@@ -464,28 +468,28 @@ var FHC_AjaxClient = {
}; };
// remoteController must be a NON-empty string // remoteController must be a NON-empty string
if (typeof remoteController == "string" && remoteController.trim() != "") if (typeof remoteController == "string" && remoteController.trim() != "")
{ {
// Is it possible to generate the URL // Is it possible to generate the URL
if ((url = FHC_AjaxClient._generateRouterURI(remoteController)) != null) if ((url = FHC_AjaxClient._generateRouterURI(remoteController)) != null)
{ {
ajaxParameters.url = url; ajaxParameters.url = url;
} }
else // but it could fail else // but it could fail
{ {
console.error("FHC_JS_DATA_STORAGE_OBJECT is not present"); console.error("FHC_JS_DATA_STORAGE_OBJECT is not present");
valid = false; valid = false;
} }
} }
else // otherwise is NOT possible to generate the URL else // otherwise is NOT possible to generate the URL
{ {
console.error("Invalid remoteController parameter"); console.error("Invalid remoteController parameter");
valid = false; valid = false;
} }
// controllerParameters must be an object // controllerParameters must be an object
if (typeof controllerParameters == "object") if (typeof controllerParameters == "object")
{ {
// If controllerParameters contains uploaded file(s) as FileList // If controllerParameters contains uploaded file(s) as FileList
if (controllerParameters !== null && FHC_AjaxClient._hasFileList(controllerParameters)) if (controllerParameters !== null && FHC_AjaxClient._hasFileList(controllerParameters))
{ {
@@ -511,19 +515,18 @@ var FHC_AjaxClient = {
// so the variable data is saved also in _data and it will be used later // so the variable data is saved also in _data and it will be used later
ajaxParameters.data = data; ajaxParameters.data = data;
ajaxParameters._data = data; ajaxParameters._data = data;
} }
else else
{ {
console.error("Invalid controller parameters, must be an object"); console.error("Invalid controller parameters, must be an object");
valid = false; valid = false;
} }
// Checks if ajaxCallParameters is an object // Checks if ajaxCallParameters is an object
if (typeof ajaxCallParameters == "object") if (typeof ajaxCallParameters == "object")
{ {
// If present, errorCallback must be a function // If present, errorCallback must be a function
if (ajaxCallParameters.hasOwnProperty("errorCallback")) if (ajaxCallParameters.hasOwnProperty("errorCallback"))
{ {
if (typeof ajaxCallParameters.errorCallback == "function") if (typeof ajaxCallParameters.errorCallback == "function")
{ {
@@ -535,7 +538,7 @@ var FHC_AjaxClient = {
console.error("Invalid errorCallback, it must be a function"); console.error("Invalid errorCallback, it must be a function");
valid = false; valid = false;
} }
} }
else // if is not given then call the default errorCallback else // if is not given then call the default errorCallback
{ {
ajaxParameters._errorCallback = FHC_AjaxClient._defaultErrorCallback; // save as property the callback error ajaxParameters._errorCallback = FHC_AjaxClient._defaultErrorCallback; // save as property the callback error
@@ -543,8 +546,8 @@ var FHC_AjaxClient = {
} }
// If present, successCallback must be a function // If present, successCallback must be a function
if (ajaxCallParameters.hasOwnProperty("successCallback")) if (ajaxCallParameters.hasOwnProperty("successCallback"))
{ {
if (typeof ajaxCallParameters.successCallback == "function") if (typeof ajaxCallParameters.successCallback == "function")
{ {
ajaxParameters._successCallback = ajaxCallParameters.successCallback; // save as property the callback success ajaxParameters._successCallback = ajaxCallParameters.successCallback; // save as property the callback success
@@ -555,11 +558,11 @@ var FHC_AjaxClient = {
console.error("Invalid successCallback, it must be a function"); console.error("Invalid successCallback, it must be a function");
valid = false; valid = false;
} }
} }
// If present, completeCallback must be a function // If present, completeCallback must be a function
if (ajaxCallParameters.hasOwnProperty("completeCallback")) if (ajaxCallParameters.hasOwnProperty("completeCallback"))
{ {
if (typeof ajaxCallParameters.completeCallback == "function") if (typeof ajaxCallParameters.completeCallback == "function")
{ {
ajaxParameters._completeCallback = ajaxCallParameters.completeCallback; // save as property the callback complete ajaxParameters._completeCallback = ajaxCallParameters.completeCallback; // save as property the callback complete
@@ -569,7 +572,7 @@ var FHC_AjaxClient = {
console.error("Invalid completeCallback, it must be a function"); console.error("Invalid completeCallback, it must be a function");
valid = false; valid = false;
} }
} }
// If present, veilTimeout must be a number and cannot be less then 0 or greater then 60000 // If present, veilTimeout must be a number and cannot be less then 0 or greater then 60000
if (ajaxCallParameters.hasOwnProperty("veilTimeout") && typeof ajaxCallParameters.veilTimeout == "number") if (ajaxCallParameters.hasOwnProperty("veilTimeout") && typeof ajaxCallParameters.veilTimeout == "number")
@@ -595,6 +598,24 @@ var FHC_AjaxClient = {
ajaxParameters.beforeSend = FHC_AjaxClient._showVeil; ajaxParameters.beforeSend = FHC_AjaxClient._showVeil;
} }
// If present reloadPage has to be a boolean
if (ajaxCallParameters.hasOwnProperty("reloadPage"))
{
if (typeof ajaxCallParameters.reloadPage != "boolean")
{
console.error("Invalid reloadPage parameter, must be a boolean");
valid = false;
}
else
{
ajaxParameters._reloadPage = ajaxCallParameters.reloadPage;
}
}
else // not present
{
ajaxParameters._reloadPage = false;
}
// Function to call after the ajax call is ended, is it here because it must be always called // Function to call after the ajax call is ended, is it here because it must be always called
ajaxParameters.complete = FHC_AjaxClient._onComplete; ajaxParameters.complete = FHC_AjaxClient._onComplete;
} }
@@ -604,7 +625,7 @@ var FHC_AjaxClient = {
ajaxParameters = null; ajaxParameters = null;
} }
return ajaxParameters; return ajaxParameters;
}, },
/** /**
@@ -622,9 +643,10 @@ var FHC_AjaxClient = {
var ajaxParameters = FHC_AjaxClient._checkAndGenerateAjaxParams(remoteController, controllerParameters, type, ajaxCallParameters); var ajaxParameters = FHC_AjaxClient._checkAndGenerateAjaxParams(remoteController, controllerParameters, type, ajaxCallParameters);
// Checks the given parameters if they are present and are valid // Checks the given parameters if they are present and are valid
if (ajaxParameters != null) if (ajaxParameters != null)
{ {
$.ajax(ajaxParameters); // ajax call $.ajax(ajaxParameters); // ajax call
} }
} }
}; };
public/js/FilterWidget.js
+43 -18
View File
@@ -46,11 +46,12 @@ function sideMenuHook()
filterUniqueId: FHC_FilterWidget.getFilterUniqueIdPrefix() filterUniqueId: FHC_FilterWidget.getFilterUniqueIdPrefix()
}, },
{ {
reloadPage: true,
successCallback: function(data, textStatus, jqXHR) { successCallback: function(data, textStatus, jqXHR) {
if (FHC_AjaxClient.isError(data)) if (FHC_AjaxClient.isError(data))
{ {
console.log(FHC_AjaxClient.getError(data)); console.error(FHC_AjaxClient.getError(data));
} }
else else
{ {
@@ -141,7 +142,7 @@ var FHC_FilterWidget = {
if (FHC_AjaxClient.isError(data)) if (FHC_AjaxClient.isError(data))
{ {
console.log(FHC_AjaxClient.getError(data)); console.error(FHC_AjaxClient.getError(data));
} }
else else
{ {
@@ -157,7 +158,7 @@ var FHC_FilterWidget = {
if (FHC_AjaxClient.isError(data)) if (FHC_AjaxClient.isError(data))
{ {
console.log(FHC_AjaxClient.getError(data)); console.error(FHC_AjaxClient.getError(data));
} }
else else
{ {
@@ -174,6 +175,7 @@ var FHC_FilterWidget = {
$("#addField").html("<option value=''>" + FHC_PhrasesLib.t("ui", "bitteEintragWaehlen") + "</option>"); $("#addField").html("<option value=''>" + FHC_PhrasesLib.t("ui", "bitteEintragWaehlen") + "</option>");
$("#appliedFilters").html(""); $("#appliedFilters").html("");
$("#addFilter").html("<option value=''>" + FHC_PhrasesLib.t("ui", "bitteEintragWaehlen") + "</option>"); $("#addFilter").html("<option value=''>" + FHC_PhrasesLib.t("ui", "bitteEintragWaehlen") + "</option>");
FHC_FilterWidget._toggleApplySaveButtons(false);
// If the choosen dataset representation is tablesorter // If the choosen dataset representation is tablesorter
if (FHC_FilterWidget._datasetRepresentation == DATASET_REP_TABLESORTER) if (FHC_FilterWidget._datasetRepresentation == DATASET_REP_TABLESORTER)
@@ -218,7 +220,7 @@ var FHC_FilterWidget = {
} }
else else
{ {
console.log(FHC_AjaxClient.getError(data)); console.error(FHC_AjaxClient.getError(data));
} }
} }
} }
@@ -290,6 +292,8 @@ var FHC_FilterWidget = {
$(".remove-selected-field").off("click"); $(".remove-selected-field").off("click");
$("#addField").off("change"); $("#addField").off("change");
$(".applied-filter-operation").off("change"); $(".applied-filter-operation").off("change");
$(".applied-filter-condition").off("keyup");
$(".applied-filter-option").off("change");
$(".remove-applied-filter").off("click"); $(".remove-applied-filter").off("click");
$("#addFilter").off("change"); $("#addFilter").off("change");
$("#applyFilter").off("click"); $("#applyFilter").off("click");
@@ -314,6 +318,8 @@ var FHC_FilterWidget = {
$(".remove-selected-field").click(FHC_FilterWidget._revomeSelectedFieldsEvent); // Click event on the "X" link $(".remove-selected-field").click(FHC_FilterWidget._revomeSelectedFieldsEvent); // Click event on the "X" link
$("#addField").change(FHC_FilterWidget._addFieldEvent); // Change event on the fields drop-down to add new fields $("#addField").change(FHC_FilterWidget._addFieldEvent); // Change event on the fields drop-down to add new fields
$(".applied-filter-operation").change(FHC_FilterWidget._appliedFiltersOperationsEvent); // Change event on the operation drop-down $(".applied-filter-operation").change(FHC_FilterWidget._appliedFiltersOperationsEvent); // Change event on the operation drop-down
$(".applied-filter-condition").keyup(FHC_FilterWidget._appliedFiltersConditionsEvent); // Change event on the conditions fields
$(".applied-filter-option").change(FHC_FilterWidget._appliedFiltersOptionsEvent); // Change event on the operation drop-down
$(".remove-applied-filter").click(FHC_FilterWidget._removeAppliedFiltersEvent); // Click event to the "X" button to remove an applied filter $(".remove-applied-filter").click(FHC_FilterWidget._removeAppliedFiltersEvent); // Click event to the "X" button to remove an applied filter
$("#addFilter").change(FHC_FilterWidget._addFilterEvent); // Click event on the applied filters drop-down to add a new filter to the dataset $("#addFilter").change(FHC_FilterWidget._addFilterEvent); // Click event on the applied filters drop-down to add a new filter to the dataset
$("#applyFilter").click(FHC_FilterWidget._applyFilterEvent); // Click event on the applied filters drop-down to apply filters to the dataset $("#applyFilter").click(FHC_FilterWidget._applyFilterEvent); // Click event on the applied filters drop-down to apply filters to the dataset
@@ -456,6 +462,22 @@ var FHC_FilterWidget = {
$(this).parent().parent().find(".applied-filter-condition").prop("disabled", false); $(this).parent().parent().find(".applied-filter-condition").prop("disabled", false);
$(this).parent().parent().find(".applied-filter-option").prop("disabled", false); $(this).parent().parent().find(".applied-filter-option").prop("disabled", false);
} }
FHC_FilterWidget._toggleApplySaveButtons(true);
},
/**
* Event function used by the applied filter conditions
*/
_appliedFiltersConditionsEvent: function(event) {
FHC_FilterWidget._toggleApplySaveButtons(true);
},
/**
* Event function used by the applied filter options
*/
_appliedFiltersOptionsEvent: function(event) {
FHC_FilterWidget._toggleApplySaveButtons(true);
}, },
/** /**
@@ -481,7 +503,7 @@ var FHC_FilterWidget = {
* Event function used by the apply filter button * Event function used by the apply filter button
* The given parameter is used to decide if the page is going to be reloaded * The given parameter is used to decide if the page is going to be reloaded
*/ */
_applyFilterEvent: function(reload = true) { _applyFilterEvent: function() {
var appliedFilters = []; var appliedFilters = [];
var appliedFiltersOperations = []; var appliedFiltersOperations = [];
@@ -506,15 +528,7 @@ var FHC_FilterWidget = {
}, },
{ {
successCallback: function(data, textStatus, jqXHR) { successCallback: function(data, textStatus, jqXHR) {
FHC_FilterWidget._failOrReload(data, textStatus, jqXHR);
if (reload === true)
{
FHC_FilterWidget._failOrReload(data, textStatus, jqXHR);
}
else
{
console.log(FHC_AjaxClient.getError(data));
}
} }
} }
); );
@@ -586,9 +600,6 @@ var FHC_FilterWidget = {
if ($("#customFilterDescription").val() != "") if ($("#customFilterDescription").val() != "")
{ {
// Apply the filter before saving it, without reloading the page
FHC_FilterWidget._applyFilterEvent(false);
FHC_AjaxClient.ajaxCallPost( FHC_AjaxClient.ajaxCallPost(
"widgets/Filters/saveCustomFilter", "widgets/Filters/saveCustomFilter",
{ {
@@ -597,7 +608,12 @@ var FHC_FilterWidget = {
}, },
{ {
successCallback: function(data, textStatus, jqXHR) { successCallback: function(data, textStatus, jqXHR) {
FHC_FilterWidget._failOrReload(data);
// If an error occurred then log it
if (FHC_AjaxClient.isError(data)) console.error(data);
// In any case tries to apply the filter
FHC_FilterWidget._applyFilterEvent();
} }
} }
); );
@@ -1265,6 +1281,14 @@ var FHC_FilterWidget = {
{ {
FHC_FilterWidget._hideOptions = data.hideOptions; FHC_FilterWidget._hideOptions = data.hideOptions;
} }
},
/**
* Enable/disable the apply and save buttons
*/
_toggleApplySaveButtons(addedNewFilterOption) {
$("#applyFilter").prop("disabled", addedNewFilterOption != true);
$("#saveCustomFilterButton").prop("disabled", addedNewFilterOption === true);
} }
}; };
@@ -1276,3 +1300,4 @@ $(document).ready(function() {
FHC_FilterWidget.display(); FHC_FilterWidget.display();
}); });
system/phrasesupdate.php
+21
View File
@@ -1577,6 +1577,27 @@ $phrases = array(
) )
), ),
array(
'app' => 'core',
'category' => 'filter',
'phrase' => 'filterApply',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Filtern',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Apply',
'description' => '',
'insertvon' => 'system'
)
)
),
array( array(
'app' => 'core', 'app' => 'core',
'category' => 'filter', 'category' => 'filter',