diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorship.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorship.ftl deleted file mode 100644 index c6a894a2..00000000 --- a/productMods/templates/freemarker/visualization/coauthorship/coAuthorship.ftl +++ /dev/null @@ -1,241 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#assign visImageContextPath = "${urls.images}/visualization/" > -<#assign loadingImageLink = "${visImageContextPath}ajax-loader.gif"> - -<#assign egoVivoProfileURL = "${urls.base}/individual?uri=${egoURI}"> - -<#assign egoSparklineDataURL = '${urls.base}${dataVisualizationURLRoot}?vis=person_pub_count&uri=${egoURI}&labelField=label'> -<#assign coAuthorshipDownloadFile = '${urls.base}${dataVisualizationURLRoot}?vis=person_level&uri=${egoURI}&labelField=label'> - -
- - -<#-- - -Support for this has ended. Only created for the VIVO Conf Demo. - - - - - -
- - - <%-- Image --%> -
- - <%-- Label --%> -

- - <%-- Moniker--%> - - - -
- - - - -
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.
- -

Co-Author Network - - - (GraphML File)

- - - - - - - - - Currently there are no ${authorsText} papers for - this author in the VIVO database. - - - - - - Currently there are no papers for - this author in the VIVO database. - - - -
- - - -
- - -
- -
- -
- -
-
-
- -
 
- -
-
VIVO profile | Co-author network
-
-
  Publication(s)
-
  Co-author(s)
- - - - -
- -
- - - - - -
- -

Table

- - - -
-

-
- - - -
- -
- - -
- - - ---> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/sparklineAjaxVisContent.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl similarity index 59% rename from productMods/templates/freemarker/visualization/sparklineAjaxVisContent.ftl rename to productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl index d7bbedb4..d8a556c1 100644 --- a/productMods/templates/freemarker/visualization/sparklineAjaxVisContent.ftl +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl @@ -1,5 +1,5 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#if shouldVIVOrenderVis> - <#include "/visualization/publicationSparklineContent.ftl"> + <#include "/visualization/coauthorship/coAuthorshipSparklineContent.ftl"> diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl new file mode 100644 index 00000000..c9fd039c --- /dev/null +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl @@ -0,0 +1,197 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#assign visContainerID = '${sparklineVO.visContainerDivID}'> + +<#if sparklineVO.shortVisMode> + <#assign sparklineContainerID = 'unique_coauthors_short_sparkline_vis'> +<#else> + <#assign sparklineContainerID = 'unique_coauthors_full_sparkline_vis'> + + +<#-- This is used to prevent collision between sparkline & visualization conatiner div ids. --> +<#if visContainerID?upper_case == sparklineContainerID?upper_case> + <#assign sparklineContainerID = visContainerID + "_spark"> + + +
+
+ + +
+ + <#if sparklineVO.shortVisMode> + <#----> +

View full timeline and co-author network.

+ <#----> + <#else> + +

+ + + + + + + + + + + <#list sparklineVO.yearToActivityCount?keys as year> + + + + + + + +
+ Unique Co-Authors per year (.CSV File) +
+ Year + + Count +
+ ${year} + + ${sparklineVO.yearToActivityCount[year]} +
+ Download data as .csv file. +
+

+ +
\ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl new file mode 100644 index 00000000..fae5834c --- /dev/null +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl @@ -0,0 +1,7 @@ +<#-- $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/coauthorship/coAuthorshipSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/grantSparklineContent.ftl b/productMods/templates/freemarker/visualization/grantSparklineContent.ftl index 5844e8f8..3420e087 100644 --- a/productMods/templates/freemarker/visualization/grantSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/grantSparklineContent.ftl @@ -58,9 +58,9 @@ data.addColumn('number', 'Grants'); data.addRows(${sparklineVO.numOfYearsToBeRendered}); - <#list sparklineVO.yearToGrantCountDataTable as yearToGrantCountDataElement> - data.setValue(${yearToGrantCountDataElement.grantCounter}, 0, '${yearToGrantCountDataElement.investigatedYear}'); - data.setValue(${yearToGrantCountDataElement.grantCounter}, 1, ${yearToGrantCountDataElement.currentGrants}); + <#list sparklineVO.yearToEntityCountDataTable as yearToGrantCountDataElement> + data.setValue(${yearToGrantCountDataElement.yearToEntityCounter}, 0, '${yearToGrantCountDataElement.year}'); + data.setValue(${yearToGrantCountDataElement.yearToEntityCounter}, 1, ${yearToGrantCountDataElement.currentEntitiesCount}); <#-- Create a view of the data containing only the column pertaining to grant count. --> diff --git a/productMods/templates/freemarker/visualization/personPublicationCountDynamicActivator.ftl b/productMods/templates/freemarker/visualization/personPublicationCountDynamicActivator.ftl new file mode 100644 index 00000000..2075785c --- /dev/null +++ b/productMods/templates/freemarker/visualization/personPublicationCountDynamicActivator.ftl @@ -0,0 +1,5 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#if shouldVIVOrenderVis> + <#include "/visualization/publication/personPublicationSparklineContent.ftl"> + diff --git a/productMods/templates/freemarker/visualization/publicationCount.ftl b/productMods/templates/freemarker/visualization/personPublicationCountStandaloneActivator.ftl similarity index 84% rename from productMods/templates/freemarker/visualization/publicationCount.ftl rename to productMods/templates/freemarker/visualization/personPublicationCountStandaloneActivator.ftl index ab78c65a..3035ba93 100644 --- a/productMods/templates/freemarker/visualization/publicationCount.ftl +++ b/productMods/templates/freemarker/visualization/personPublicationCountStandaloneActivator.ftl @@ -4,4 +4,4 @@ ${headScripts.add(googleJSAPI)} -<#include "/visualization/publicationSparklineContent.ftl"> \ No newline at end of file +<#include "/visualization/personPublicationSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/publicationSparklineContent.ftl b/productMods/templates/freemarker/visualization/personPublicationSparklineContent.ftl similarity index 96% rename from productMods/templates/freemarker/visualization/publicationSparklineContent.ftl rename to productMods/templates/freemarker/visualization/personPublicationSparklineContent.ftl index a7c31ff8..46e8da66 100644 --- a/productMods/templates/freemarker/visualization/publicationSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/personPublicationSparklineContent.ftl @@ -23,9 +23,9 @@ data.addColumn('number', 'Publications'); data.addRows(${sparklineVO.numOfYearsToBeRendered}); - <#list sparklineVO.yearToPublicationCountDataTable as yearToPublicationCountDataElement> - data.setValue(${yearToPublicationCountDataElement.publicationCounter}, 0, '${yearToPublicationCountDataElement.publishedYear}'); - data.setValue(${yearToPublicationCountDataElement.publicationCounter}, 1, ${yearToPublicationCountDataElement.currentPublications}); + <#list sparklineVO.yearToEntityCountDataTable as yearToPublicationCountDataElement> + data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 0, '${yearToPublicationCountDataElement.year}'); + data.setValue(${yearToPublicationCountDataElement.yearToEntityCounter}, 1, ${yearToPublicationCountDataElement.currentEntitiesCount}); <#-- Create a view of the data containing only the column pertaining to publication count. --> diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl new file mode 100644 index 00000000..2075785c --- /dev/null +++ b/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl @@ -0,0 +1,5 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#if shouldVIVOrenderVis> + <#include "/visualization/publication/personPublicationSparklineContent.ftl"> + diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl new file mode 100644 index 00000000..2de2615e --- /dev/null +++ b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl @@ -0,0 +1,7 @@ +<#-- $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/publication/personPublicationSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl new file mode 100644 index 00000000..46e8da66 --- /dev/null +++ b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -0,0 +1,199 @@ +<#-- $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'> + + +<#-- This is used to prevent collision between sparkline & visualization conatiner div ids. --> +<#if visContainerID?upper_case == sparklineContainerID?upper_case> + <#assign sparklineContainerID = visContainerID + "_spark"> + + +
+
+ + +
+ + <#if sparklineVO.shortVisMode> + <#----> +

View all VIVO publications and corresponding co-author network.

+ <#----> + <#else> + +

+ + + + + + + + + + + <#list sparklineVO.yearToActivityCount?keys as year> + + + + + + + +
+ Publications per year (.CSV File) +
+ Year + + Publications +
+ ${year} + + ${sparklineVO.yearToActivityCount[year]} +
+ Download data as .csv file. +
+

+ +
\ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java index 3452bf74..6a112d56 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coauthorship/CoAuthorshipVisCodeGenerator.java @@ -2,10 +2,12 @@ package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.coauthorship; +import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; @@ -18,8 +20,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMa import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Node; -import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Node; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; @SuppressWarnings("serial") @@ -172,6 +175,7 @@ public class CoAuthorshipVisCodeGenerator { int uniqueCoAuthorCounter = 0; int renderedFullSparks = 0; Set allCoAuthorsWithKnownAuthorshipYears = new HashSet(); + List yearToUniqueCoauthorsCountDataTable = new ArrayList(); for (int publicationYear = minPubYearConsidered; publicationYear <= currentYear; @@ -200,6 +204,11 @@ public class CoAuthorshipVisCodeGenerator { + ", 1, " + currentUniqueCoAuthors + ");\n"); + + yearToUniqueCoauthorsCountDataTable.add(new YearToEntityCountDataElement(uniqueCoAuthorCounter, + publicationYearAsString, + currentUniqueCoAuthors)); + uniqueCoAuthorCounter++; } @@ -210,6 +219,10 @@ public class CoAuthorshipVisCodeGenerator { * associated with it. Hence. * */ renderedFullSparks = allCoAuthorsWithKnownAuthorshipYears.size(); + + sparklineData.setRenderedSparks(renderedFullSparks); + + sparklineData.setYearToEntityCountDataTable(yearToUniqueCoauthorsCountDataTable); /* * Total publications will also consider publications that have no year associated with @@ -221,6 +234,7 @@ public class CoAuthorshipVisCodeGenerator { .get(VOConstants.DEFAULT_PUBLICATION_YEAR).size(); } + sparklineData.setUnknownYearPublications(unknownYearCoauthors); String sparklineDisplayOptions = "{width: 65, height: 30, showAxisLines: false, " + "showValueLabels: false, labelPosition: 'none'}"; @@ -230,12 +244,15 @@ public class CoAuthorshipVisCodeGenerator { } else { visContainerID = DEFAULT_VISCONTAINER_DIV_ID; } + + sparklineData.setVisContainerDivID(visContainerID); /* * By default these represents the range of the rendered sparks. Only in case of * "short" sparkline mode we will set the Earliest RenderedPublication year to * "currentYear - 10". * */ + sparklineData.setEarliestYearConsidered(minPubYearConsidered); sparklineData.setEarliestRenderedPublicationYear(minPublishedYear); sparklineData.setLatestRenderedPublicationYear(currentYear); @@ -253,6 +270,9 @@ public class CoAuthorshipVisCodeGenerator { if (VisualizationFrameworkConstants.SHORT_SPARKLINE_VIS_MODE.equalsIgnoreCase(visMode)) { sparklineData.setEarliestRenderedPublicationYear(shortSparkMinYear); + + sparklineData.setShortVisMode(true); + generateShortSparklineVisualizationContent(currentYear, shortSparkMinYear, visContainerID, @@ -260,6 +280,8 @@ public class CoAuthorshipVisCodeGenerator { unknownYearCoauthors, sparklineDisplayOptions); } else { + sparklineData.setShortVisMode(false); + generateFullSparklineVisualizationContent(currentYear, minPubYearConsidered, visContainerID, diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java index f6263d73..7bdeaa60 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/coprincipalinvestigator/CoPIGrantCountRequestHandler.java @@ -34,8 +34,7 @@ public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler @Override public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, DataSource dataSource) throws MalformedQueryParametersException { - // TODO Auto-generated method stub - return null; + throw new UnsupportedOperationException("Co-PI Grant Count does not provide Ajax Response."); } @Override diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java index 655fff12..dc51b79b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountVisCodeGenerator.java @@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Grant; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearGrantCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; @SuppressWarnings("serial") @@ -190,7 +190,7 @@ public class PersonGrantCountVisCodeGenerator { */ int renderedFullSparks = 0; - List yearToGrantCountDataTable = new ArrayList(); + List yearToGrantCountDataTable = new ArrayList(); for (int grantYear = minGrantYearConsidered; grantYear <= currentYear; grantYear++) { @@ -208,7 +208,7 @@ public class PersonGrantCountVisCodeGenerator { + ", 1, " + currentGrants + ");\n"); yearToGrantCountDataTable - .add(new YearGrantCountDataElement( + .add(new YearToEntityCountDataElement( grantCounter, stringInvestigatedYear, currentGrants)); @@ -222,7 +222,7 @@ public class PersonGrantCountVisCodeGenerator { } sparklineData - .setYearToGrantCountDataTable(yearToGrantCountDataTable); + .setYearToEntityCountDataTable(yearToGrantCountDataTable); sparklineData.setRenderedSparks(renderedFullSparks); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java index b39ba7bd..a7222449 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java @@ -259,7 +259,8 @@ VisualizationRequestHandler { Portal portal = vreq.getPortal(); - String standaloneTemplate = "/visualization/publicationCount.ftl"; +// String standaloneTemplate = "/visualization/publication/personPublicationCountStandaloneActivator.ftl"; + String standaloneTemplate = "/visualization/personPublicationCountStandaloneActivator.ftl"; Map body = new HashMap(); body.put("portalBean", portal); @@ -284,7 +285,8 @@ VisualizationRequestHandler { Portal portal = vreq.getPortal(); - String dynamicTemplate = "/visualization/sparklineAjaxVisContent.ftl"; +// String dynamicTemplate = "/visualization/publication/personPublicationCountDynamicActivator.ftl"; + String dynamicTemplate = "/visualization/personPublicationCountDynamicActivator.ftl"; Map body = new HashMap(); body.put("portalBean", portal); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java index 9b1a9109..62c43d4b 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.constants.VisConstants; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.BiboDocument; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearPublicationCountDataElement; +import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.YearToEntityCountDataElement; @SuppressWarnings("serial") @@ -200,7 +200,7 @@ public class PersonPublicationCountVisCodeGenerator { * */ int renderedFullSparks = 0; - List yearToPublicationCountDataTable = new ArrayList(); + List yearToPublicationCountDataTable = new ArrayList(); for (int publicationYear = minPubYearConsidered; publicationYear <= currentYear; @@ -225,7 +225,7 @@ public class PersonPublicationCountVisCodeGenerator { + currentPublications + ");\n"); - yearToPublicationCountDataTable.add(new YearPublicationCountDataElement(publicationCounter, stringPublishedYear, currentPublications)); + yearToPublicationCountDataTable.add(new YearToEntityCountDataElement(publicationCounter, stringPublishedYear, currentPublications)); /* * Sparks that will be rendered will always be the one's which has @@ -236,7 +236,7 @@ public class PersonPublicationCountVisCodeGenerator { } - sparklineData.setYearToPublicationCountDataTable(yearToPublicationCountDataTable); + sparklineData.setYearToEntityCountDataTable(yearToPublicationCountDataTable); sparklineData.setRenderedSparks(renderedFullSparks); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java index b5fd445b..0ca5b5a3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/SparklineData.java @@ -39,8 +39,7 @@ public class SparklineData { private boolean isShortVisMode = true; - private List yearToPublicationCountDataTable; - private List yearToGrantCountDataTable; + private List yearToEntityCountDataTable; private int numOfYearsToBeRendered; @@ -85,15 +84,6 @@ public class SparklineData { this.unknownYearGrants = unknownYearGrants; } - public List getYearToGrantCountDataTable() { - return yearToGrantCountDataTable; - } - - public void setYearToGrantCountDataTable( - List yearToGrantCountDataTable) { - this.yearToGrantCountDataTable = yearToGrantCountDataTable; - } - public void setNumOfYearsToBeRendered(int numOfYearsToBeRendered) { this.numOfYearsToBeRendered = numOfYearsToBeRendered; } @@ -102,13 +92,13 @@ public class SparklineData { return numOfYearsToBeRendered; } - public void setYearToPublicationCountDataTable( - List yearToPublicationCountDataTable) { - this.yearToPublicationCountDataTable = yearToPublicationCountDataTable; + public void setYearToEntityCountDataTable( + List yearToEntityCountDataTable) { + this.yearToEntityCountDataTable = yearToEntityCountDataTable; } - public List getYearToPublicationCountDataTable() { - return yearToPublicationCountDataTable; + public List getYearToEntityCountDataTable() { + return yearToEntityCountDataTable; } public void setYearToActivityCount(Map yearToActivityCount) { diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearGrantCountDataElement.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearGrantCountDataElement.java deleted file mode 100644 index 3bf4d480..00000000 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearGrantCountDataElement.java +++ /dev/null @@ -1,36 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; - -/** - * This object is used to store information about the yearToGrantCount Map in the format - * easily expressed to Google Visualization's DataTableAPI. - * @author bkoniden - * Deepak Konidena - */ - -public class YearGrantCountDataElement { - - private int grantCounter; - private String investigatedYear; - private int currentGrants; - - public YearGrantCountDataElement(int grantCounter, - String investigatedYear, int currentGrants) { - this.grantCounter = grantCounter; - this.investigatedYear = investigatedYear; - this.currentGrants = currentGrants; - } - - public int getGrantCounter() { - return grantCounter; - } - - public String getInvestigatedYear() { - return investigatedYear; - } - - public int getCurrentGrants() { - return currentGrants; - } - -} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearPublicationCountDataElement.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearPublicationCountDataElement.java deleted file mode 100644 index 5e1313fc..00000000 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearPublicationCountDataElement.java +++ /dev/null @@ -1,35 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; - -/** - * This object is used to store information about the yearToPublicationCount Map in the format - * easily expressed to Google Visualization's DataTableAPI. - * @author cdtank - * - */ -public class YearPublicationCountDataElement { - - private int publicationCounter; - private String publishedYear; - private int currentPublications; - - public YearPublicationCountDataElement(int publicationCounter, - String publishedYear, int currentPublications) { - this.publicationCounter = publicationCounter; - this.publishedYear = publishedYear; - this.currentPublications = currentPublications; - } - - public int getPublicationCounter() { - return publicationCounter; - } - - public String getPublishedYear() { - return publishedYear; - } - - public int getCurrentPublications() { - return currentPublications; - } - -} diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java new file mode 100644 index 00000000..96d6577b --- /dev/null +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/valueobjects/YearToEntityCountDataElement.java @@ -0,0 +1,35 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +package edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects; + +/** + * This object is used to store information about the yearToEntityCount Map in the format + * easily expressed to Google Visualization's DataTableAPI. + * @author cdtank + * + */ +public class YearToEntityCountDataElement { + + private int yearToEntityCounter; + private String year; + private int currentEntitiesCount; + + public YearToEntityCountDataElement(int yearToEntityCounter, + String year, int currentEntitiesCount) { + this.yearToEntityCounter = yearToEntityCounter; + this.year = year; + this.currentEntitiesCount = currentEntitiesCount; + } + + public int getYearToEntityCounter() { + return yearToEntityCounter; + } + + public String getYear() { + return year; + } + + public int getCurrentEntitiesCount() { + return currentEntitiesCount; + } + +}