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

Fix issues preventing rendering and functioning of temporal graph. Resolve https://jira.lyrasis.org/browse/VIVO-1978 (#235)

Browse source
This commit is contained in:
Brian Lowe 2021-04-21 18:14:16 +03:00 • committed by GitHub
parent 2fa7cce5c7
commit 2be59bbe02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1069,7 +1069,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
// console.log(processJSONData.currentEntityLevel); // console.log(processJSONData.currentEntityLevel);
if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") { if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) {
$.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations); $.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations);
} }
@ -1193,7 +1193,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
*/ */
function reloadDataTablePagination(preselectedEntityURIs, jsonData){ function reloadDataTablePagination(preselectedEntityURIs, jsonData){
if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") { if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) {
/* /*
* This will make sure that duplicate filters are not added. * This will make sure that duplicate filters are not added.

6
webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
View file

@ -34,7 +34,7 @@
<#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> <#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'>
<#assign publicationParameter = { "name": "${i18n().publication?js_string}", <#assign publicationParameter = { "name": "publication",
"pluralName": "${i18n().publications?js_string}", "pluralName": "${i18n().publications?js_string}",
"verbName": "${i18n().published?js_string}", "verbName": "${i18n().published?js_string}",
"dropDownText": "${i18n().by_publications?js_string}", "dropDownText": "${i18n().by_publications?js_string}",
@ -44,7 +44,7 @@
"csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison", "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison",
"value": "${i18n().publications?js_string}" }> "value": "${i18n().publications?js_string}" }>
<#assign grantParameter = { "name": "${i18n().grant?js_string}", <#assign grantParameter = { "name": "grant",
"pluralName": "${i18n().grants?js_string}", "pluralName": "${i18n().grants?js_string}",
"verbName": "${i18n().granted?js_string}", "verbName": "${i18n().granted?js_string}",
"dropDownText": "${i18n().by_grants?js_string}", "dropDownText": "${i18n().by_grants?js_string}",
@ -74,7 +74,7 @@ var activitiesLabel = {
plural: '${i18n().activities?js_string}' plural: '${i18n().activities?js_string}'
}; };
var i18nStringsGuiEvents = { var i18nStringsGuiEvents = {
temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string}, temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string}',
temporalGraphLower: '${i18n().temporal_graph?js_string?js_string}', temporalGraphLower: '${i18n().temporal_graph?js_string?js_string}',
viewString: '${i18n().view?js_string}', viewString: '${i18n().view?js_string}',
entityMaxNote: '${i18n().max_entity_note?js_string}', entityMaxNote: '${i18n().max_entity_note?js_string}',