diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java index 6f7ae886d..a81703755 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/VisualizationCodeGenerator.java @@ -111,7 +111,6 @@ public class VisualizationCodeGenerator { if (yearToUniqueCoauthorsCount.size() > 0) { try { minPublishedYear = Integer.parseInt(Collections.min(publishedYears)); - System.out.println("min pub year - " + minPublishedYear); } catch (NoSuchElementException e1) { log.debug("vis: " + e1.getMessage() + " error occurred for " + yearToUniqueCoauthorsCount.toString()); } catch (NumberFormatException e2) { @@ -221,10 +220,13 @@ public class VisualizationCodeGenerator { * Total publications will also consider publications that have no year associated with * it. Hence. * */ + Integer unknownYearCoauthors = 0; if (yearToUniqueCoauthorsCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR) != null) { totalUniqueCoAuthors += yearToUniqueCoauthorsCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR); + unknownYearCoauthors = yearToUniqueCoauthorsCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR); } - + + String sparklineDisplayOptions = "{width: 63, height: 21, showAxisLines: false, " + "showValueLabels: false, labelPosition: 'none'}"; @@ -261,6 +263,7 @@ public class VisualizationCodeGenerator { shortSparkMinYear, visContainerID, visualizationCode, + unknownYearCoauthors, totalUniqueCoAuthors, sparklineDisplayOptions); } else { @@ -268,6 +271,7 @@ public class VisualizationCodeGenerator { minPubYearConsidered, visContainerID, visualizationCode, + unknownYearCoauthors, totalUniqueCoAuthors, renderedFullSparks, sparklineDisplayOptions); @@ -287,8 +291,8 @@ public class VisualizationCodeGenerator { private void generateShortSparklineVisualizationContent(int currentYear, int shortSparkMinYear, String visContainerID, - StringBuilder visualizationCode, int totalUniqueCoAuthors, - String sparklineDisplayOptions) { + StringBuilder visualizationCode, int unknownYearCoauthors, + int totalUniqueCoAuthors, String sparklineDisplayOptions) { /* * Create a view of the data containing only the column pertaining to publication count. @@ -330,7 +334,7 @@ public class VisualizationCodeGenerator { /* * Generate the text introducing the vis. * */ - visualizationCode.append("$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_number').text(renderedShortSparks);"); + visualizationCode.append("$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_number').text(parseInt(renderedShortSparks) + parseInt(" + unknownYearCoauthors + "));"); visualizationCode.append("var shortSparksText = ''" + "+ ' Unique co-author(s) with year from '" + "+ ' " + totalUniqueCoAuthors + " '" + @@ -353,7 +357,7 @@ public class VisualizationCodeGenerator { private void generateFullSparklineVisualizationContent( int currentYear, int minPubYearConsidered, String visContainerID, StringBuilder visualizationCode, - int totalUniqueCoAuthors, int renderedFullSparks, + int unknownYearCoauthors, int totalUniqueCoAuthors, int renderedFullSparks, String sparklineDisplayOptions) { String csvDownloadURLHref = ""; @@ -383,7 +387,7 @@ public class VisualizationCodeGenerator { ");\n" + "full_spark.draw(fullSparklineView, " + sparklineDisplayOptions + ");\n"); - visualizationCode.append("$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_number').text('" + renderedFullSparks + "');"); + visualizationCode.append("$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_number').text('" + (renderedFullSparks + unknownYearCoauthors) + "');"); visualizationCode.append("var allSparksText = ''" + "+ ' Unique co-author(s) from '" + diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java index f1fcbc6ba..94ed87edf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java @@ -118,7 +118,6 @@ public class VisualizationCodeGenerator { if (yearToPublicationCount.size() > 0) { try { minPublishedYear = Integer.parseInt(Collections.min(publishedYears)); - System.out.println("min pub year - " + minPublishedYear); } catch (NoSuchElementException e1) { log.debug("vis: " + e1.getMessage() + " error occurred for " + yearToPublicationCount.toString()); } catch (NumberFormatException e2) { @@ -231,8 +230,10 @@ public class VisualizationCodeGenerator { * Total publications will also consider publications that have no year associated with * it. Hence. * */ + Integer unknownYearPublications = 0; if (yearToPublicationCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR) != null) { totalPublications += yearToPublicationCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR); + unknownYearPublications = yearToPublicationCount.get(VOConstants.DEFAULT_PUBLICATION_YEAR); } String sparklineDisplayOptions = "{width: 63, height: 21, showAxisLines: false, " + @@ -271,13 +272,15 @@ public class VisualizationCodeGenerator { shortSparkMinYear, visContainerID, visualizationCode, + unknownYearPublications, totalPublications, sparklineDisplayOptions); } else { generateFullSparklineVisualizationContent(currentYear, minPubYearConsidered, visContainerID, - visualizationCode, + visualizationCode, + unknownYearPublications, totalPublications, renderedFullSparks, sparklineDisplayOptions); @@ -297,8 +300,8 @@ public class VisualizationCodeGenerator { private void generateShortSparklineVisualizationContent(int currentYear, int shortSparkMinYear, String visContainerID, - StringBuilder visualizationCode, int totalPublications, - String sparklineDisplayOptions) { + StringBuilder visualizationCode, int unknownYearPublications, + int totalPublications, String sparklineDisplayOptions) { /* * Create a view of the data containing only the column pertaining to publication count. @@ -340,9 +343,15 @@ public class VisualizationCodeGenerator { /* * Generate the text introducing the vis. * */ - visualizationCode.append("$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_number').text(renderedShortSparks);"); + + + String imcompleteDataText = "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."; + + visualizationCode.append("$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_number').text(parseInt(renderedShortSparks) + parseInt(" + unknownYearPublications + "));"); visualizationCode.append("var shortSparksText = ''" + - "+ ' publications within the last 10 years '" + + "+ ' publications within the last 10 years " + + "(incomplete data)'" + /*"+ ' " + totalPublications + " '" + "+ ' total " + "" + @@ -362,7 +371,9 @@ public class VisualizationCodeGenerator { } private void generateFullSparklineVisualizationContent( - int currentYear, int minPubYearConsidered, String visContainerID, StringBuilder visualizationCode, + int currentYear, int minPubYearConsidered, String visContainerID, + StringBuilder visualizationCode, + int unknownYearPublications, int totalPublications, int renderedFullSparks, String sparklineDisplayOptions) { @@ -393,7 +404,7 @@ public class VisualizationCodeGenerator { ");\n" + "full_spark.draw(fullSparklineView, " + sparklineDisplayOptions + ");\n"); - visualizationCode.append("$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_number').text('" + renderedFullSparks + "');"); + visualizationCode.append("$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_number').text('" + (renderedFullSparks + unknownYearPublications) + "');"); visualizationCode.append("var allSparksText = ''" + "+ ' publications '" + diff --git a/webapp/web/templates/visualization/person_level.jsp b/webapp/web/templates/visualization/person_level.jsp index 1f74d2963..68c9b6f4c 100644 --- a/webapp/web/templates/visualization/person_level.jsp +++ b/webapp/web/templates/visualization/person_level.jsp @@ -18,6 +18,9 @@ + + + @@ -137,7 +140,7 @@ table.sparkline_wrapper_table td, th { <%-- Label --%> -

+

<%-- Moniker--%> @@ -145,6 +148,9 @@ table.sparkline_wrapper_table td, th {
+
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.
+ <%-- Sparkline --%>

General Statistics