1. Modified style of person pub count vis.
2. Modified the logic that generated download links for csv files. 3. Modified IE specific css code.
This commit is contained in:
parent
eae82a00b4
commit
8e05bf4de4
6 changed files with 54 additions and 37 deletions
|
@ -49,7 +49,7 @@ public class TestJava {
|
||||||
System.out.println(sampleBlurns);
|
System.out.println(sampleBlurns);
|
||||||
for (String blurb : sampleBlurns) {
|
for (String blurb : sampleBlurns) {
|
||||||
|
|
||||||
// System.out.println(blurb.substring(0, 10));
|
System.out.println(blurb.contains("author"));
|
||||||
}
|
}
|
||||||
Map<String, Integer> yearToPublicationCount = new TreeMap<String, Integer>();
|
Map<String, Integer> yearToPublicationCount = new TreeMap<String, Integer>();
|
||||||
|
|
||||||
|
|
|
@ -518,9 +518,14 @@ public class VisualizationCodeGenerator {
|
||||||
|
|
||||||
if (yearToUniqueCoauthorsCount.size() > 0) {
|
if (yearToUniqueCoauthorsCount.size() > 0) {
|
||||||
|
|
||||||
|
String secondaryContextPath = "";
|
||||||
|
if (!contextPath.contains("/admin/visQuery")) {
|
||||||
|
secondaryContextPath = "/admin/visQuery";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
String downloadURL = contextPath
|
String downloadURL = contextPath
|
||||||
// + "/admin/visQuery"
|
+ secondaryContextPath
|
||||||
+ "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
+ "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
||||||
+ "=" + URLEncoder.encode(individualURIParam,
|
+ "=" + URLEncoder.encode(individualURIParam,
|
||||||
VisualizationController.URL_ENCODING_SCHEME).toString()
|
VisualizationController.URL_ENCODING_SCHEME).toString()
|
||||||
|
@ -554,8 +559,13 @@ public class VisualizationCodeGenerator {
|
||||||
String fullTimelineLink;
|
String fullTimelineLink;
|
||||||
if (yearToUniqueCoauthorsCount.size() > 0) {
|
if (yearToUniqueCoauthorsCount.size() > 0) {
|
||||||
|
|
||||||
|
String secondaryContextPath = "";
|
||||||
|
if (!contextPath.contains("/admin/visQuery")) {
|
||||||
|
secondaryContextPath = "/admin/visQuery";
|
||||||
|
}
|
||||||
|
|
||||||
String fullTimelineNetworkURL = contextPath
|
String fullTimelineNetworkURL = contextPath
|
||||||
+ "/admin/visQuery"
|
+ secondaryContextPath
|
||||||
+ "?"
|
+ "?"
|
||||||
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
||||||
+ "=" + URLEncoder.encode(individualURIParam,
|
+ "=" + URLEncoder.encode(individualURIParam,
|
||||||
|
|
|
@ -152,7 +152,7 @@ public class VisualizationCodeGenerator {
|
||||||
"table.sparkline_wrapper_table td, th {" +
|
"table.sparkline_wrapper_table td, th {" +
|
||||||
" vertical-align: bottom;" +
|
" vertical-align: bottom;" +
|
||||||
"}" +
|
"}" +
|
||||||
".vis_link {" +
|
".vis_link a{" +
|
||||||
" padding-top: 5px;" +
|
" padding-top: 5px;" +
|
||||||
"}" +
|
"}" +
|
||||||
"td.sparkline_number { text-align:right; padding-right:5px; }" +
|
"td.sparkline_number { text-align:right; padding-right:5px; }" +
|
||||||
|
@ -530,9 +530,14 @@ public class VisualizationCodeGenerator {
|
||||||
|
|
||||||
if (yearToPublicationCount.size() > 0) {
|
if (yearToPublicationCount.size() > 0) {
|
||||||
|
|
||||||
|
String secondaryContextPath = "";
|
||||||
|
if (!contextPath.contains("/admin/visQuery")) {
|
||||||
|
secondaryContextPath = "/admin/visQuery";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
String downloadURL = contextPath
|
String downloadURL = contextPath
|
||||||
// + "/admin/visQuery"
|
+ secondaryContextPath
|
||||||
+ "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
+ "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
||||||
+ "=" + URLEncoder.encode(individualURIParam,
|
+ "=" + URLEncoder.encode(individualURIParam,
|
||||||
VisualizationController.URL_ENCODING_SCHEME).toString()
|
VisualizationController.URL_ENCODING_SCHEME).toString()
|
||||||
|
@ -561,8 +566,13 @@ public class VisualizationCodeGenerator {
|
||||||
String fullTimelineLink;
|
String fullTimelineLink;
|
||||||
if (yearToPublicationCount.size() > 0) {
|
if (yearToPublicationCount.size() > 0) {
|
||||||
|
|
||||||
|
String secondaryContextPath = "";
|
||||||
|
if (!contextPath.contains("/admin/visQuery")) {
|
||||||
|
secondaryContextPath = "/admin/visQuery";
|
||||||
|
}
|
||||||
|
|
||||||
String fullTimelineNetworkURL = contextPath
|
String fullTimelineNetworkURL = contextPath
|
||||||
+ "/admin/visQuery"
|
+ secondaryContextPath
|
||||||
+ "?"
|
+ "?"
|
||||||
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
+ VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE
|
||||||
+ "=" + URLEncoder.encode(individualURIParam,
|
+ "=" + URLEncoder.encode(individualURIParam,
|
||||||
|
@ -588,7 +598,7 @@ public class VisualizationCodeGenerator {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
divContextCode.append("<p class=\"vis_link\">" + fullTimelineLink + "</p>");
|
divContextCode.append("<span class=\"vis_link\">" + fullTimelineLink + "</span>");
|
||||||
|
|
||||||
} catch (UnsupportedEncodingException e) {
|
} catch (UnsupportedEncodingException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
@ -638,9 +648,6 @@ public class VisualizationCodeGenerator {
|
||||||
}
|
}
|
||||||
|
|
||||||
dataTable.append("</tbody>\n" +
|
dataTable.append("</tbody>\n" +
|
||||||
// "<tfoot>" +
|
|
||||||
// "<tr><td colspan='2'>*DNA - Data not available</td></tr>" +
|
|
||||||
// "</tfoot>\n" +
|
|
||||||
"</table>\n");
|
"</table>\n");
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -124,13 +124,6 @@ public class VisualizationRequestHandler {
|
||||||
log);
|
log);
|
||||||
|
|
||||||
|
|
||||||
System.out.println("ft url - " + valueObjectContainer.getFullTimelineNetworkLink());
|
|
||||||
System.out.println("dnld fl - " + valueObjectContainer.getDownloadDataLink());
|
|
||||||
System.out.println("table - " + valueObjectContainer.getTable());
|
|
||||||
System.out.println("min - " + valueObjectContainer.getEarliestRenderedPublicationYear());
|
|
||||||
System.out.println("max - " + valueObjectContainer.getLatestRenderedPublicationYear());
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is side-effecting because the response of this method is just to redirect to
|
* This is side-effecting because the response of this method is just to redirect to
|
||||||
* a page with visualization on it.
|
* a page with visualization on it.
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
<c:param name="uri" value="${entity.URI}"/>
|
<c:param name="uri" value="${entity.URI}"/>
|
||||||
</c:url>
|
</c:url>
|
||||||
|
|
||||||
<!-- PDF Visualization URL
|
<%-- PDF Visualization URL
|
||||||
|
|
||||||
For now we have disabled this.
|
For now we have disabled this.
|
||||||
|
|
||||||
|
@ -72,30 +72,21 @@
|
||||||
<c:param name="uri" value="${entity.URI}"/>
|
<c:param name="uri" value="${entity.URI}"/>
|
||||||
</c:url>
|
</c:url>
|
||||||
|
|
||||||
-->
|
--%>
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
#vis_container {
|
#vis_container {
|
||||||
cursor:pointer;
|
cursor:pointer;
|
||||||
height:36px;
|
/*height:36px;
|
||||||
margin-left:24%;
|
margin-left:24%;
|
||||||
margin-top:-2%;
|
margin-top:-2%;
|
||||||
position:absolute;
|
position:absolute;*/
|
||||||
/*width:380px;*/
|
/*width:380px;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!--[if IE]>
|
|
||||||
<style type="text/css">
|
|
||||||
|
|
||||||
#vis_container {
|
|
||||||
padding-bottom:15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
</style>
|
|
||||||
<![endif]-->
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
<!--
|
<!--
|
||||||
|
@ -129,7 +120,24 @@
|
||||||
${entity.URI}
|
${entity.URI}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--
|
|
||||||
|
<!--[if IE]>
|
||||||
|
<style type="text/css">
|
||||||
|
|
||||||
|
#vis_container a{
|
||||||
|
padding-bottom:5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vis_link a{
|
||||||
|
padding:10px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
</style>
|
||||||
|
<![endif]-->
|
||||||
|
|
||||||
|
<%--
|
||||||
|
|
||||||
For now we have disabled PDF report vis.
|
For now we have disabled PDF report vis.
|
||||||
|
|
||||||
|
@ -137,7 +145,7 @@
|
||||||
This is the <a href="${pdfURL}">link</a> to PDF report.
|
This is the <a href="${pdfURL}">link</a> to PDF report.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
-->
|
--%>
|
||||||
|
|
||||||
<!-- END Visualization Code -->
|
<!-- END Visualization Code -->
|
||||||
|
|
||||||
|
|
|
@ -8,9 +8,8 @@
|
||||||
<div class="staticPageBackground">
|
<div class="staticPageBackground">
|
||||||
|
|
||||||
|
|
||||||
<div id="vis_container">
|
<div id="pub_count_vis_container">
|
||||||
${sparkline.sparklineContent}
|
${sparkline.sparklineContent}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
${sparkline.sparklineContext}
|
${sparkline.sparklineContext}
|
||||||
</div>
|
</div>
|
Loading…
Add table
Add a link
Reference in a new issue