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

Browse source
This commit is contained in:
cdtank 2010-07-08 16:04:01 +00:00
parent fce96cde92
commit bc1b43e9de
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java
View file

@ -145,7 +145,7 @@ public class VisualizationCodeGenerator {
" border-spacing: 0;" + " border-spacing: 0;" +
" vertical-align: inherit;" + " vertical-align: inherit;" +
"}" + "}" +
"td.sparkline_number { text-align:right; padding-right:10px; }" + "td.sparkline_number { text-align:right; padding-right:5px; }" +
"td.sparkline_text {text-align:left;}" + "td.sparkline_text {text-align:left;}" +
/*"#sparkline_data_table {" + /*"#sparkline_data_table {" +
"width: auto;" + "width: auto;" +
@ -173,8 +173,7 @@ public class VisualizationCodeGenerator {
visualizationCode.append("<script type=\"text/javascript\">\n" + visualizationCode.append("<script type=\"text/javascript\">\n" +
"function drawVisualization(providedSparklineImgID) {\n" + "function drawVisualization(providedSparklineImgTD) {\n" +
"console.log(providedSparklineImgID)" +
"var data = new google.visualization.DataTable();\n" + "var data = new google.visualization.DataTable();\n" +
"data.addColumn('string', 'Year');\n" + "data.addColumn('string', 'Year');\n" +
"data.addColumn('number', 'Publications');\n" + "data.addColumn('number', 'Publications');\n" +
@ -185,7 +184,6 @@ public class VisualizationCodeGenerator {
int renderedFullSparks = 0; int renderedFullSparks = 0;
System.out.println("min pub year v2 - " + minPublishedYear);
for (int publicationYear = minPubYearConsidered; publicationYear <= currentYear; publicationYear++) { for (int publicationYear = minPubYearConsidered; publicationYear <= currentYear; publicationYear++) {
String stringPublishedYear = String.valueOf(publicationYear); String stringPublishedYear = String.valueOf(publicationYear);
@ -311,7 +309,7 @@ public class VisualizationCodeGenerator {
* */ * */
visualizationCode.append("var short_spark = new google.visualization.ImageSparkLine(" + visualizationCode.append("var short_spark = new google.visualization.ImageSparkLine(" +
// "document.getElementById('" + visDivNames.get("SHORT_SPARK") + "')" + // "document.getElementById('" + visDivNames.get("SHORT_SPARK") + "')" +
"$('#' + providedSparklineImgID)[0]" + "providedSparklineImgTD[0]" +
");\n" + ");\n" +
"short_spark.draw(shortSparklineView, " + sparklineDisplayOptions + ");\n"); "short_spark.draw(shortSparklineView, " + sparklineDisplayOptions + ");\n");
@ -360,7 +358,7 @@ public class VisualizationCodeGenerator {
visualizationCode.append("var full_spark = new google.visualization.ImageSparkLine(" + visualizationCode.append("var full_spark = new google.visualization.ImageSparkLine(" +
// "document.getElementById('" + visDivNames.get("FULL_SPARK") + "')" + // "document.getElementById('" + visDivNames.get("FULL_SPARK") + "')" +
"$('#' + providedSparklineImgID)[0]" + "providedSparklineImgTD[0]" +
");\n" + ");\n" +
"full_spark.draw(fullSparklineView, " + sparklineDisplayOptions + ");\n"); "full_spark.draw(fullSparklineView, " + sparklineDisplayOptions + ");\n");
@ -388,12 +386,13 @@ public class VisualizationCodeGenerator {
"var row = $('<tr>');" + "var row = $('<tr>');" +
"sparklineImgTD = $('<td>');" + "sparklineImgTD = $('<td>');" +
"sparklineImgTD.attr('id', '" + sparklineID + "_img');" + "sparklineImgTD.attr('id', '" + sparklineID + "_img');" +
"sparklineImgTD.attr('width', '150');" + "sparklineImgTD.attr('width', '75');" +
"sparklineImgTD.attr('align', 'right');" + "sparklineImgTD.attr('align', 'right');" +
"sparklineImgTD.attr('class', '" + visualizationStyleClass + "');" + "sparklineImgTD.attr('class', '" + visualizationStyleClass + "');" +
"row.append(sparklineImgTD);" + "row.append(sparklineImgTD);" +
"var sparklineNumberTD = $('<td>');" + "var sparklineNumberTD = $('<td>');" +
"sparklineNumberTD.attr('width', '100');" + "sparklineNumberTD.attr('width', '36');" +
"sparklineNumberTD.attr('align', 'right');" +
"sparklineNumberTD.attr('class', 'sparkline_number');" + "sparklineNumberTD.attr('class', 'sparkline_number');" +
"row.append(sparklineNumberTD);" + "row.append(sparklineNumberTD);" +
"var sparklineTextTD = $('<td>');" + "var sparklineTextTD = $('<td>');" +
@ -424,12 +423,10 @@ public class VisualizationCodeGenerator {
"$('<div/>', {'id': '" + sparklineID + "'," + "$('<div/>', {'id': '" + sparklineID + "'," +
"'class': '" + visualizationStyleClass + "'" + "'class': '" + visualizationStyleClass + "'" +
"});" + "}).prependTo('#" + visContainerID + "');" +
sparklineTableWrapper + sparklineTableWrapper +
"$('#" + sparklineID + "').prependTo('#" + visContainerID + "');" +
"}" + "}" +
"drawVisualization('" + sparklineID + "_img');" + "drawVisualization('" + sparklineID + "_img');" +