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

1. Fix for http://issues.library.cornell.edu/browse/NIHVIVO-3070 made sure that the rows in the table for person level vis were created based on whether the entity in question has egoURI or not, instead of depending upon flash vis to provide sorted list with egoNode being the first element.

Browse source 
2. Tentative fix for http://issues.library.cornell.edu/browse/NIHVIVO-2953 will wait to hear more to change the UX further.

3. Fix for http://issues.library.cornell.edu/browse/NIHVIVO-2523 the current placement for downloading of this csv is subject to change.
This commit is contained in:
tankchintan 2011-07-27 21:44:45 +00:00
parent c37ae62188
commit 6c3818f84a
8 changed files with 123 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,6 @@ $("input[type=checkbox].easyDeselectCheckbox").live('click', function(){
var entityToBeRemoved = URIToEntityRecord[checkboxValue];
if(!checkbox.is(':checked')){
//console.log("Easy deselect checkbox is unclicked!");
updateRowHighlighter(linkedCheckbox);
removeUsedColor(entityToBeRemoved);
removeEntityUnChecked(renderedObjects, entityToBeRemoved);
@ -169,8 +168,6 @@ $(".filter-option").live('click', function() {
temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
}
// clearRenderedObjects();
$(this).addClass('active-filter');
temporalGraphProcessor.dataTable.fnDraw();
@ -379,7 +376,7 @@ var processJSONData = {
* dynamically generate checkboxes
*/
loadData: function(jsonData, dataTableParams) {
processJSONData.setupGlobals(jsonData, true);
temporalGraphProcessor.dataTable = prepareTableForDataTablePagination(jsonData, dataTableParams);
@ -395,7 +392,7 @@ var processJSONData = {
* dynamically generate checkboxes
*/
reloadData: function(preselectedEntityURIs, jsonData) {
processJSONData.setupGlobals(jsonData);
temporalGraphProcessor.dataTable = reloadDataTablePagination(preselectedEntityURIs, jsonData);
@ -419,6 +416,8 @@ function entityCheckboxOperatedOnEventListener() {
var checkboxValue = $(this).attr("value");
var entity = URIToEntityRecord[checkboxValue];
temporalGraphProcessor.isDefaultSelectionsMaintained = false;
if (checkbox.is(':checked')) {
performEntityCheckboxSelectedActions(entity, checkboxValue, checkbox);
@ -436,8 +435,6 @@ function renderTemporalGraphVisualization(parameters) {
setupLoadingScreen(parameters.responseContainer);
//return;
getTemporalGraphData(parameters.dataURL,
parameters.bodyContainer,
parameters.errorContainer,
@ -570,6 +567,8 @@ var entitySelector = {
temporalGraphProcessor = {
isDefaultSelectionsMaintained: true,
loadingScreenTimeout: '',
currentSelectedFilter: 'ORGANIZATIONS',
@ -626,9 +625,20 @@ temporalGraphProcessor = {
var currentSelectedEntityURIs = [];
$.each(URIToCheckedEntities, function(index, entity){
currentSelectedEntityURIs.push(index);
});
/*
* We want to make sure that the currently selected entities are preserved only if they
* were somehow manipulated by the users.
* */
if (!temporalGraphProcessor.isDefaultSelectionsMaintained) {
$.each(URIToCheckedEntities, function(index, entity){
currentSelectedEntityURIs.push(index);
});
}
/*
* Reset the "is default selections maintained" value.
* */
temporalGraphProcessor.isDefaultSelectionsMaintained = true;
clearRenderedObjects();
@ -658,6 +668,13 @@ temporalGraphProcessor = {
}
});
} else {
/*
* We have to redraw the table so that top 3 entities are selected. fnDraw() triggers sorting of the
* table and other filters.
* */
temporalGraphProcessor.dataTable.fnDraw();
/*
* This will make sure that top 3 entities are selected by default when the page loads.
*/