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

FilterWidget: extended the functionality of the default_filter flag

Browse Source 
If only the "app" and "dataset_name" parameters are given, at the first loading of the FilterWidget:
1. Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
2. Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
3. Do not load anything to avoid to retrive too many data from DB
This commit is contained in:
Paolo
2018-06-08 12:01:41 +02:00
parent dbd25d98bd
commit d6578277c2
2 changed files with 639 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/FilterWidget.js
+599 -553
View File
File diff suppressed because it is too large Load Diff
public/js/infocenter/infocenterPersonDataset.js
+40 -31
View File
@@ -1,13 +1,31 @@
/**
* Javascript file for infocenter overview page
*/
$(document).ready(function() {
InfocenterPersonDataset.appendTableActionsHtml();
// setTableActions();
});
/**
* Refreshes the side menu
* NOTE: it is called from the FilterWidget therefore must be a global function
*/
function refreshSideMenu()
{
//
FHC_AjaxClient.ajaxCallGet(
'system/infocenter/InfoCenter/setNavigationMenuArrayJson',
null,
{
successCallback: function(data, textStatus, jqXHR) {
FHC_NavigationWidget.renderSideMenu();
},
errorCallback: function(jqXHR, textStatus, errorThrown) {
alert(textStatus);
}
}
);
}
/**
*
*/
var InfocenterPersonDataset = {
/**
@@ -40,16 +58,16 @@ var InfocenterPersonDataset = {
FHC_AjaxClient.ajaxCallGet(
'system/Filters/rowNumber',
{
filter_page: FHC_JS_DATA_STORAGE_OBJECT.called_path + "/" + FHC_JS_DATA_STORAGE_OBJECT.called_method
filter_page: FHC_FilterWidget.getFilterPage()
},
{
successCallback: function(data, textStatus, jqXHR) {
if (data != null)
if (FHC_AjaxClient.hasData(data))
{
if (data.rowNumber != null)
{
personcount = data.rowNumber;
personcount = FHC_AjaxClient.getData(data);
if (personcount > 0)
{
var persontext = personcount === 1 ? "Person" : "Personen";
var countHtml = personcount + " " + persontext;
@@ -62,9 +80,9 @@ var InfocenterPersonDataset = {
"</div>"
);
$("#datasetActionsBottom").append("<br><br>");
}
InfocenterPersonDataset.setTableActions();
InfocenterPersonDataset.setTableActions();
}
}
},
errorCallback: function(jqXHR, textStatus, errorThrown) {
@@ -108,24 +126,15 @@ var InfocenterPersonDataset = {
trs.find("input[name=PersonId\\[\\]]").prop("checked", false);
}
);
},
/**
* Refreshes the side menu
*/
refreshSideMenu: function()
{
FHC_AjaxClient.ajaxCallGet(
'system/infocenter/InfoCenter/setNavigationMenuArrayJson',
null,
{
successCallback: function(data, textStatus, jqXHR) {
FHC_NavigationWidget.renderSideMenu();
},
errorCallback: function(jqXHR, textStatus, errorThrown) {
alert(textStatus);
}
}
);
}
};
/**
* When JQuery is up
*/
$(document).ready(function() {
InfocenterPersonDataset.appendTableActionsHtml();
});