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

[VIVO-1235] Temporal graph bug fixes

Browse source
This commit is contained in:
Benjamin Gross 2016-03-16 16:58:30 -06:00
parent 18d551b1a2
commit 93f263d8f5
4 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/main/webapp/js/visualization/entitycomparison/gui-event-manager.js
View file

@ -164,13 +164,21 @@ $(".filter-option").live('click', function() {
if ($(this).attr('id') === 'people-filter') { if ($(this).attr('id') === 'people-filter') {
$("#organizations-filter").removeClass('active-filter'); $("#organizations-filter").removeClass('active-filter');
$("#no-filter").removeClass('active-filter');
temporalGraphProcessor.currentSelectedFilter = "PEOPLE"; temporalGraphProcessor.currentSelectedFilter = "PEOPLE";
} else if ($(this).attr('id') === 'organizations-filter') { } else if ($(this).attr('id') === 'organizations-filter') {
$("#people-filter").removeClass('active-filter'); $("#people-filter").removeClass('active-filter');
$("#no-filter").removeClass('active-filter');
temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS"; temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
} }
else if ($(this).attr('id') === 'no-filter') {
$("#people-filter").removeClass('active-filter');
$("#organizations-filter").removeClass('active-filter');
temporalGraphProcessor.currentSelectedFilter = "NONE";
}
$(this).addClass('active-filter'); $(this).addClass('active-filter');
@ -639,11 +647,6 @@ temporalGraphProcessor = {
}); });
} }
/*
* Reset the "is default selections maintained" value.
* */
temporalGraphProcessor.isDefaultSelectionsMaintained = true;
clearRenderedObjects(); clearRenderedObjects();
initConstants(); initConstants();
@ -709,4 +712,4 @@ temporalGraphProcessor = {
} }
$("#copy-vis-viewlink input[type='text']").val(getCurrentParameterVisViewLink()); $("#copy-vis-viewlink input[type='text']").val(getCurrentParameterVisViewLink());
} }
} }

9
webapp/src/main/webapp/js/visualization/entitycomparison/util.js
View file

@ -221,7 +221,10 @@ var DatatableCustomFilters = {
var currentEntityVisMode = URIToEntityRecord[entityURI].visMode; var currentEntityVisMode = URIToEntityRecord[entityURI].visMode;
if (currentEntityVisMode === "ORGANIZATION" if (temporalGraphProcessor.currentSelectedFilter === "NONE") {
return true;
}
else if (currentEntityVisMode === "ORGANIZATION"
&& temporalGraphProcessor.currentSelectedFilter === "ORGANIZATIONS") { && temporalGraphProcessor.currentSelectedFilter === "ORGANIZATIONS") {
return true; return true;
} else if (currentEntityVisMode === "PERSON" } else if (currentEntityVisMode === "PERSON"
@ -1065,7 +1068,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
// console.log(processJSONData.currentEntityLevel); // console.log(processJSONData.currentEntityLevel);
if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS & PEOPLE") { if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") {
$.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations); $.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations);
} }
@ -1189,7 +1192,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
*/ */
function reloadDataTablePagination(preselectedEntityURIs, jsonData){ function reloadDataTablePagination(preselectedEntityURIs, jsonData){
if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS & PEOPLE") { if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") {
/* /*
* This will make sure that duplicate filters are not added. * This will make sure that duplicate filters are not added.

9
webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
View file

@ -69,10 +69,11 @@
</div> </div>
</div> </div>
<h3>${i18n().what_to_compare}</h3>
<div id="people-organizations-filter"> <div id="people-organizations-filter">
<span id="organizations-filter" class="filter-option active-filter">${i18n().organizations_capitalized}</span> | <h3>${i18n().what_to_compare}</h3>
<span id="people-filter" class="filter-option">${i18n().people_capitalized}</span> <span id="organizations-filter" class="filter-option">${i18n().organizations_capitalized}</span> |
<span id="people-filter" class="filter-option">${i18n().people_capitalized}</span> |
<span id="no-filter" class="filter-option">${i18n().view_all}</span>
<img class="filterInfoIcon" src="${urls.images}/iconInfo.png" <img class="filterInfoIcon" src="${urls.images}/iconInfo.png"
alt="${i18n().info_icon}" alt="${i18n().info_icon}"
title="${i18n().organization_hierarchy_note(organizationLabel)}" /> title="${i18n().organization_hierarchy_note(organizationLabel)}" />
@ -118,4 +119,4 @@
<span style="background-color: #A8A8A8; width: 25px;" class="known-bar legend-bar">&nbsp;</span> <span id="legend-known-bar-text">${currentParameterObject.name} ${i18n().with_known_year}</span><br /> <span style="background-color: #A8A8A8; width: 25px;" class="known-bar legend-bar">&nbsp;</span> <span id="legend-known-bar-text">${currentParameterObject.name} ${i18n().with_known_year}</span><br />
<span style="background-color: #CDCDCD; width: 25px;" class="current-year-legend-bar legend-bar">&nbsp;</span> <span id="legend-current-year-bar-text">${currentParameterObject.name} ${i18n().from_current_incomplete_year}</span> <span style="background-color: #CDCDCD; width: 25px;" class="current-year-legend-bar legend-bar">&nbsp;</span> <span id="legend-current-year-bar-text">${currentParameterObject.name} ${i18n().from_current_incomplete_year}</span>
</div> </div>
</div> </div>

5
webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl
View file

@ -46,9 +46,6 @@ $(document).ready(function () {
<#assign currentParameterObject = grantParameter> <#assign currentParameterObject = grantParameter>
<div id="temporal-graph-response"> <div id="temporal-graph-response">
<#if (builtFromCacheTime??) >
<div class="cache-info-small">${i18n().using_cache_time} ${builtFromCacheTime?time} (${builtFromCacheTime?date?string("MMM dd yyyy")})</div>
</#if>
<#include "entityComparisonBody.ftl"> <#include "entityComparisonBody.ftl">
@ -59,4 +56,4 @@ via JavaScript.
--> -->
<#include "entityGrantComparisonError.ftl"> <#include "entityGrantComparisonError.ftl">
</div> </div>