1. In Temporal vis developed vis drilling up from lower level. (see http://issues.library.cornell.edu/browse/NIHVIVO-1800)
2. Refactored client-side code for temporal vis.
This commit is contained in:
parent
82c4d1faa7
commit
ae43216396
19 changed files with 449 additions and 78 deletions
|
@ -2,6 +2,11 @@
|
|||
|
||||
<div id="body">
|
||||
|
||||
<div id="subject-parent-entity">
|
||||
<a id="subject-parent-entity-profile-url" href="#"></a>
|
||||
<a id="subject-parent-entity-temporal-url" href="#"><img src="${temporalGraphSmallIcon}" width="15px" height="15px"/></a>
|
||||
</div>
|
||||
|
||||
<h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a>
|
||||
<img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="This information is based solely on ${currentParameterObject.value} which have been loaded into the VIVO system" /></span></h2>
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ var currentParameter = "${currentParameter}";
|
|||
/*
|
||||
This is used in util.js to print grant temporal graph links for all sub-organizations.
|
||||
*/
|
||||
var subOrganizationTemporalGraphURL = "${subOrganizationGrantTemporalGraphCommonURL}";
|
||||
var temporalGraphCommonURL = subOrganizationGrantTemporalGraphCommonURL;
|
||||
|
||||
var temporalGraphDataURL = '${temporalGraphDataURL}';
|
||||
|
||||
|
@ -50,7 +50,7 @@ $(document).ready(function () {
|
|||
<#include "entityComparisonBody.ftl">
|
||||
|
||||
<#--
|
||||
Right now we include the error message by default becuae currently I could not devise any more smarted solution. By default
|
||||
Right now we include the error message by default because currently I could not devise any more smarted solution. By default
|
||||
the CSS of the #error-container is display:none; so it will be hidden unless explicitly commanded to be shown which we do in
|
||||
via JavaScript.
|
||||
-->
|
||||
|
|
|
@ -23,7 +23,7 @@ var currentParameter = "${currentParameter}";
|
|||
/*
|
||||
This is used in util.js to print grant temporal graph links for all sub-organizations.
|
||||
*/
|
||||
var subOrganizationTemporalGraphURL = "${subOrganizationPublicationTemporalGraphCommonURL}";
|
||||
var temporalGraphCommonURL = subOrganizationPublicationTemporalGraphCommonURL;
|
||||
|
||||
var temporalGraphDataURL = '${temporalGraphDataURL}';
|
||||
|
||||
|
@ -50,7 +50,7 @@ $(document).ready(function () {
|
|||
<#include "entityComparisonBody.ftl">
|
||||
|
||||
<#--
|
||||
Right now we include the error message by default becuae currently I could not devise any more smarted solution. By default
|
||||
Right now we include the error message by default because currently I could not devise any more smarted solution. By default
|
||||
the CSS of the #error-container is display:none; so it will be hidden unless explicitly commanded to be shown which we do in
|
||||
via JavaScript.
|
||||
-->
|
||||
|
|
|
@ -26,14 +26,18 @@
|
|||
"pluralName": "publications",
|
||||
"dropDownText": "by Publications",
|
||||
"viewLink": "${organizationPublicationTemporalGraphURL}",
|
||||
"dataLink": "${organizationPublicationTemporalGraphDataURL}",
|
||||
"viewBaseLink": "${subOrganizationPublicationTemporalGraphCommonURL}",
|
||||
"dataLink": "${organizationPublicationTemporalGraphDataURL}",
|
||||
"csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison",
|
||||
"value": "Publications" }>
|
||||
|
||||
<#assign grantParameter = { "name": "grant",
|
||||
"pluralName": "grants",
|
||||
"dropDownText": "by Grants",
|
||||
"viewLink": "${organizationGrantTemporalGraphURL}",
|
||||
"viewLink": "${organizationGrantTemporalGraphURL}",
|
||||
"viewBaseLink": "${subOrganizationGrantTemporalGraphCommonURL}",
|
||||
"dataLink": "${organizationGrantTemporalGraphDataURL}",
|
||||
"csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_grant_count",
|
||||
"value": "Grants" }>
|
||||
|
||||
<#assign parameterOptions = [publicationParameter, grantParameter]>
|
||||
|
@ -86,6 +90,9 @@ var contextPath = "${urls.base}";
|
|||
var temporalGraphSmallIcon = "${temporalGraphSmallIcon}";
|
||||
var subOrganizationVivoProfileURL = "${subOrganizationVivoProfileURL}";
|
||||
|
||||
var subOrganizationGrantTemporalGraphCommonURL = "${subOrganizationGrantTemporalGraphCommonURL}";
|
||||
var subOrganizationPublicationTemporalGraphCommonURL = "${subOrganizationPublicationTemporalGraphCommonURL}";
|
||||
|
||||
var jsonString = '${jsonContent!}';
|
||||
var organizationLabel = '${organizationLabel}';
|
||||
var organizationVIVOProfileURL = "${organizationVivoProfileURL}";
|
||||
|
@ -97,7 +104,7 @@ var entityCheckboxSelectorDOMClass = "${entityCheckboxSelectorDOMClass}";
|
|||
|
||||
var isDataRequestSentViaAJAX = false;
|
||||
|
||||
var temporalGraphProcessor;
|
||||
var csvDownloadURL, temporalGraphProcessor;
|
||||
|
||||
/*
|
||||
This has to be declared before making a call to GUI event manager JS.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue