litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1. More changes to the front-end for temporal vis re:text & info-icons.

Browse source
This commit is contained in:
cdtank 2011-04-19 16:45:11 +00:00
parent 86b855df95
commit c65f02a3d6
4 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
productMods/js/visualization/entitycomparison/gui-event-manager.js
View file

@ -263,7 +263,7 @@ var processJSONData = {
return sum;
},
setupGlobals: function(jsonContent) {
setupGlobals: function(jsonContent, resetFilter) {
var entityLevels = new Array();
var entityActivityCount = {
@ -325,23 +325,30 @@ var processJSONData = {
});
if (entityActivityCount.ORGANIZATION >= entityActivityCount.PERSON) {
temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
$("#organizations-filter").addClass("active-filter");
$("#people-filter").removeClass("active-filter");
} else {
temporalGraphProcessor.currentSelectedFilter = "PEOPLE";
$("#people-filter").addClass("active-filter");
$("#organizations-filter").removeClass("active-filter");
/*
* We do not want to change the current filter setting if the user has changed the parameter
* from the dropdown box. Only when the temporal vis is loaded directly we want to make sure
* that the group of entites that has the most activity is shown.
* */
if (resetFilter) {
if (entityActivityCount.ORGANIZATION >= entityActivityCount.PERSON) {
temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
$("#organizations-filter").addClass("active-filter");
$("#people-filter").removeClass("active-filter");
} else {
temporalGraphProcessor.currentSelectedFilter = "PEOPLE";
$("#people-filter").addClass("active-filter");
$("#organizations-filter").removeClass("active-filter");
}
}
if (processJSONData.isParentEntityAvailable) {
$("#subject-parent-entity").show();
} else {
@ -373,7 +380,7 @@ var processJSONData = {
*/
loadData: function(jsonData, dataTableParams) {
processJSONData.setupGlobals(jsonData);
processJSONData.setupGlobals(jsonData, true);
temporalGraphProcessor.dataTable = prepareTableForDataTablePagination(jsonData, dataTableParams);
@ -619,11 +626,15 @@ temporalGraphProcessor = {
var currentSelectedEntityURIs = [];
console.log(URIToCheckedEntities);
$.each(URIToCheckedEntities, function(index, entity){
currentSelectedEntityURIs.push(index);
});
clearRenderedObjects();
console.log(URIToCheckedEntities);
initConstants();
/*

6
productMods/js/visualization/entitycomparison/util.js
View file

@ -97,12 +97,6 @@
var iStartButton, iEndButton, i, iLen;
var oClasses = oSettings.oClasses;
// console.log(iPageCount,
// iPageCountHalf,
// iPages,
// iCurrentPage,
// oClasses);
/* Pages calculation */
if (iPages < iPageCount) {
iStartButton = 1;