1. Made changes to freemarker temnplate paths in the servlets.
2. Removed redundant templates.
This commit is contained in:
cdtank
parent
4fdaafb8f7
commit
2404668a0d
4 changed files with 2 additions and 214 deletions
|
|
@ -1,5 +0,0 @@
|
||||||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
|
||||||
|
|
||||||
<#if shouldVIVOrenderVis>
|
|
||||||
<#include "/visualization/personPublicationSparklineContent.ftl">
|
|
||||||
</#if>
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
|
||||||
|
|
||||||
<#assign googleJSAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
|
|
||||||
|
|
||||||
${headScripts.add(googleJSAPI)}
|
|
||||||
|
|
||||||
<#include "/visualization/personPublicationSparklineContent.ftl">
|
|
||||||
|
|
@ -1,199 +0,0 @@
|
||||||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
|
||||||
<#assign visContainerID = '${sparklineVO.visContainerDivID}'>
|
|
||||||
|
|
||||||
<#if sparklineVO.shortVisMode>
|
|
||||||
<#assign sparklineContainerID = 'pub_count_short_sparkline_vis'>
|
|
||||||
<#else>
|
|
||||||
<#assign sparklineContainerID = 'pub_count_full_sparkline_vis'>
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
<#-- This is used to prevent collision between sparkline & visualization conatiner div ids. -->
|
|
||||||
<#if visContainerID?upper_case == sparklineContainerID?upper_case>
|
|
||||||
<#assign sparklineContainerID = visContainerID + "_spark">
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
<div class="staticPageBackground">
|
|
||||||
<div id="${visContainerID}">
|
|
||||||
<script type="text/javascript">
|
|
||||||
|
|
||||||
function drawPubCountVisualization(providedSparklineImgTD) {
|
|
||||||
|
|
||||||
var data = new google.visualization.DataTable();
|
|
||||||
data.addColumn('string', 'Year');
|
|
||||||
data.addColumn('number', 'Publications');
|
|
||||||
data.addRows(${sparklineVO.numOfYearsToBeRendered});
|
|
||||||
|
|
||||||
<#list sparklineVO.yearToEntityCountDataTable as yearToPublicationCountDataElement>
|
|
||||||
data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 0, '${yearToPublicationCountDataElement.year}');
|
|
||||||
data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 1, ${yearToPublicationCountDataElement.currentEntitiesCount});
|
|
||||||
</#list>
|
|
||||||
|
|
||||||
<#-- Create a view of the data containing only the column pertaining to publication count. -->
|
|
||||||
var sparklineDataView = new google.visualization.DataView(data);
|
|
||||||
sparklineDataView.setColumns([1]);
|
|
||||||
|
|
||||||
<#if sparklineVO.shortVisMode>
|
|
||||||
|
|
||||||
<#-- For the short view we only want the last 10 year's view of publication count, hence we filter
|
|
||||||
the data we actually want to use for render. -->
|
|
||||||
|
|
||||||
sparklineDataView.setRows(data.getFilteredRows([{
|
|
||||||
column: 0,
|
|
||||||
minValue: '${sparklineVO.earliestRenderedPublicationYear?c}',
|
|
||||||
maxValue: '${sparklineVO.latestRenderedPublicationYear?c}'
|
|
||||||
/*minValue: '2001',
|
|
||||||
maxValue: '2011'*/
|
|
||||||
}]));
|
|
||||||
|
|
||||||
|
|
||||||
<#else>
|
|
||||||
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
|
|
||||||
<#-- Create the vis object and draw it in the div pertaining to sparkline. -->
|
|
||||||
var sparkline = new google.visualization.ImageSparkLine(providedSparklineImgTD[0]);
|
|
||||||
sparkline.draw(sparklineDataView, {
|
|
||||||
width: 65,
|
|
||||||
height: 30,
|
|
||||||
showAxisLines: false,
|
|
||||||
showValueLabels: false,
|
|
||||||
labelPosition: 'none'
|
|
||||||
});
|
|
||||||
|
|
||||||
<#if sparklineVO.shortVisMode>
|
|
||||||
|
|
||||||
<#-- We want to display how many publication counts were considered, so this is used to calculate this. -->
|
|
||||||
|
|
||||||
var shortSparkRows = sparklineDataView.getViewRows();
|
|
||||||
var renderedShortSparks = 0;
|
|
||||||
$.each(shortSparkRows, function(index, value) {
|
|
||||||
renderedShortSparks += data.getValue(value, 1);
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedShortSparks) + parseInt(${sparklineVO.unknownYearPublications}));
|
|
||||||
|
|
||||||
var sparksText = ' publication(s) within the last 10 years <span class="incomplete-data-holder" title="This information'
|
|
||||||
+ ' is based solely on publications which have been loaded into the VIVO system. This may only be a small'
|
|
||||||
+ ' sample of the person\'s total work.">incomplete list</span>';
|
|
||||||
|
|
||||||
<#else>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Sparks that will be rendered will always be the one's which has
|
|
||||||
* any year associated with it. Hence.
|
|
||||||
* */
|
|
||||||
var renderedSparks = ${sparklineVO.renderedSparks};
|
|
||||||
$('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedSparks) + parseInt(${sparklineVO.unknownYearPublications}));
|
|
||||||
|
|
||||||
var sparksText = ' publication(s) from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
|
|
||||||
+ ' to ${sparklineVO.latestRenderedPublicationYear?c}</span> '
|
|
||||||
+ ' <a href="${sparklineVO.downloadDataLink}" class="inline_href">(.CSV File)</a> ';
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
$('#${sparklineContainerID} td.sparkline_text').html(sparksText);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This will activate the visualization. It takes care of creating
|
|
||||||
* div elements to hold the actual sparkline image and then calling the
|
|
||||||
* drawPubCountVisualization function.
|
|
||||||
* */
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
|
||||||
var sparklineImgTD;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is a nuclear option (creating the container in which everything goes)
|
|
||||||
* the only reason this will be ever used is the API user never submitted a
|
|
||||||
* container ID in which everything goes. The alternative was to let the
|
|
||||||
* vis not appear in the calling page at all. So now atleast vis appears but
|
|
||||||
* appended at the bottom of the body.
|
|
||||||
* */
|
|
||||||
|
|
||||||
if ($('#${visContainerID}').length === 0) {
|
|
||||||
$('<div/>', {
|
|
||||||
'id': '${visContainerID}'
|
|
||||||
}).appendTo('body');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($('#${sparklineContainerID}').length === 0) {
|
|
||||||
|
|
||||||
$('<div/>', {
|
|
||||||
'id': '${sparklineContainerID}',
|
|
||||||
'class': 'sparkline_style'
|
|
||||||
}).prependTo('#${visContainerID}');
|
|
||||||
|
|
||||||
var table = $('<table>');
|
|
||||||
table.attr('class', 'sparkline_wrapper_table');
|
|
||||||
var row = $('<tr>');
|
|
||||||
sparklineImgTD = $('<td>');
|
|
||||||
sparklineImgTD.attr('id', '${sparklineContainerID}_img');
|
|
||||||
sparklineImgTD.attr('width', '65');
|
|
||||||
sparklineImgTD.attr('align', 'right');
|
|
||||||
sparklineImgTD.attr('class', 'sparkline_style');
|
|
||||||
|
|
||||||
row.append(sparklineImgTD);
|
|
||||||
|
|
||||||
var sparklineNumberTD = $('<td>');
|
|
||||||
sparklineNumberTD.attr('width', '30');
|
|
||||||
sparklineNumberTD.attr('align', 'right');
|
|
||||||
sparklineNumberTD.attr('class', 'sparkline_number');
|
|
||||||
row.append(sparklineNumberTD);
|
|
||||||
var sparklineTextTD = $('<td>');
|
|
||||||
sparklineTextTD.attr('width', '450');
|
|
||||||
sparklineTextTD.attr('class', 'sparkline_text');
|
|
||||||
row.append(sparklineTextTD);
|
|
||||||
table.append(row);
|
|
||||||
table.prependTo('#${sparklineContainerID}');
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
drawPubCountVisualization(sparklineImgTD);
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
</div><!-- Sparkline Viz -->
|
|
||||||
|
|
||||||
<#if sparklineVO.shortVisMode>
|
|
||||||
<#--<span class="vis_link">-->
|
|
||||||
<p><a class="all-vivo-publications" href="${sparklineVO.fullTimelineNetworkLink}">View all VIVO publications and corresponding co-author network.</a></p>
|
|
||||||
<#--</span>-->
|
|
||||||
<#else>
|
|
||||||
<!-- For Full Sparkline - Print the Table of Publication Counts per Year -->
|
|
||||||
<p>
|
|
||||||
<table id='sparkline_data_table'>
|
|
||||||
<caption>
|
|
||||||
Publications per year <a href="${sparklineVO.downloadDataLink}">(.CSV File)</a>
|
|
||||||
</caption>
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>
|
|
||||||
Year
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
Publications
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
|
|
||||||
<#list sparklineVO.yearToActivityCount?keys as year>
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
${year}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
${sparklineVO.yearToActivityCount[year]}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</#list>
|
|
||||||
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
Download data as <a href="${sparklineVO.downloadDataLink}">.csv</a> file.
|
|
||||||
<br />
|
|
||||||
</p>
|
|
||||||
</#if>
|
|
||||||
</div>
|
|
||||||
|
|
@ -259,8 +259,7 @@ VisualizationRequestHandler {
|
||||||
|
|
||||||
Portal portal = vreq.getPortal();
|
Portal portal = vreq.getPortal();
|
||||||
|
|
||||||
// String standaloneTemplate = "/visualization/publication/personPublicationCountStandaloneActivator.ftl";
|
String standaloneTemplate = "personPublicationCountStandaloneActivator.ftl";
|
||||||
String standaloneTemplate = "/visualization/personPublicationCountStandaloneActivator.ftl";
|
|
||||||
|
|
||||||
Map<String, Object> body = new HashMap<String, Object>();
|
Map<String, Object> body = new HashMap<String, Object>();
|
||||||
body.put("portalBean", portal);
|
body.put("portalBean", portal);
|
||||||
|
|
@ -286,7 +285,7 @@ VisualizationRequestHandler {
|
||||||
Portal portal = vreq.getPortal();
|
Portal portal = vreq.getPortal();
|
||||||
|
|
||||||
// String dynamicTemplate = "/visualization/publication/personPublicationCountDynamicActivator.ftl";
|
// String dynamicTemplate = "/visualization/publication/personPublicationCountDynamicActivator.ftl";
|
||||||
String dynamicTemplate = "/visualization/personPublicationCountDynamicActivator.ftl";
|
String dynamicTemplate = "personPublicationCountDynamicActivator.ftl";
|
||||||
|
|
||||||
Map<String, Object> body = new HashMap<String, Object>();
|
Map<String, Object> body = new HashMap<String, Object>();
|
||||||
body.put("portalBean", portal);
|
body.put("portalBean", portal);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue