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

Change 'Unlocated' text to Unmapped.

Browse source 
Disable People comparison due to the existing data are not sufficient to create map of science.
Support save entity table as CSV
This commit is contained in:
kongchinhua 2011-11-07 19:04:08 +00:00
parent b2476d88c9
commit 5f9d321d71
4 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js
View file

@ -58,8 +58,11 @@ var ComparisonDataTableWidget = Class.extend({
/* Create filter */
var dom = me.dom;
var filter = $('<div class="science-areas-filter">' +
'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">Organizations</span> | ' +
'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">Organizations</span>'+
/* This is temporary removed due to the person's publications mapping rate is too low to be displayed.
' | ' +
'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">People</span>' +
*/
'<img class="' + dom.filterInfoIconClass + '" id="comparisonImageIconTwo" src="'+ infoIconUrl +'" alt="information icon" title="" /></div>');
me.tableDiv.append(filter);
createToolTip($("#comparisonImageIconTwo"), $("#comparisonToolTipTwo").html(), "topLeft");
@ -199,8 +202,9 @@ var ComparisonDataTableWidget = Class.extend({
createToolTip($("#comparisonSearchInfoIcon"), $("#comparisonSearchInfoTooltipText").html(), "topLeft");
/* Create csv download button */
var csvButton = '<hr class="subtle-hr"/><div id="main-science-areas-table-footer"><a id="csv" href="' +
entityMapOfScienceSubDisciplineCSVURL +
console.log(comparisonScienceMapCsvDataUrlPrefix + me.uri);
var csvButton = '<hr class="subtle-hr"/><div id="main-science-areas-table-footer"><a href="' +
comparisonScienceMapCsvDataUrlPrefix + me.uri +
'" class="map-of-science-links">Save All as CSV</a></div>';
me.tableDiv.append(csvButton);
@ -218,12 +222,10 @@ var ComparisonDataTableWidget = Class.extend({
$("#comparison-science-areas-th").html("Organization");
me.currentSelectedFilter = COMPARISON_TYPE.ORGANIZATION;
$("a#csv").attr("href", entityMapOfScienceSubDisciplineCSVURL);
} else {
$("#comparison-science-areas-th").html("Person");
me.currentSelectedFilter = COMPARISON_TYPE.PERSON;
$("a#csv").attr("href", entityMapOfScienceDisciplineCSVURL);
}

2
productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
View file

@ -57,7 +57,7 @@ var ENTITY_TYPE = '${entityType}';
var loadingImageLink = contextPath + "/images/visualization/ajax-loader-indicator.gif";
var refreshPageImageLink = contextPath + "/images/visualization/refresh-green.png";
var comparisonScienceMapCsvDataUrlPrefix = "${urls.base}${dataVisualizationURLRoot}?labelField=label&vis=entity_comparison&uri=";
var entityMapOfScienceDisciplineCSVURL = "${entityMapOfScienceDisciplineCSVURL}";
var entityMapOfScienceSubDisciplineCSVURL = "${entityMapOfScienceSubDisciplineCSVURL}";

8
productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
View file

@ -44,7 +44,7 @@ corresponding changes in the included Templates. -->
<#-- VIEW TYPE FILTER -->
<div id="view-type-filter" style="display:${viewTypeFilterDisplay};">
<input type="radio" name="view-type" value="ENTITY"> Explore ${entityLabel} </input><br>
<input type="radio" name="view-type" value="COMPARISON"> Compare organizations (or people) </input><br><br>
<input type="radio" name="view-type" value="COMPARISON"> Compare organizations <#--/ people --></input><br><br>
</div>
<!-- <h3>What do you want to compare?</h3> -->
@ -61,14 +61,10 @@ mapped <span id="percent-mapped"></span>% of <span id="total-publications"></spa
title="" />
<div id="download-unlocated-journal-info">
<a href="${entityMapOfScienceUnlocatedJournalsCSVURL}">Save Unlocated Journals</a>
<a href="${entityMapOfScienceUnlocatedJournalsCSVURL}">Save Unmapped Publications</a>
</div>
</div>
</div>
</div>
<#-- START TOOLTIP TEXT -->

6
src/edu/cornell/mannlib/vitro/webapp/visualization/mapofscience/MapOfScienceVisualizationRequestHandler.java
View file

@ -214,7 +214,7 @@ public class MapOfScienceVisualizationRequestHandler implements
fileData.put(DataVisualizationController.FILE_CONTENT_KEY,
getUnlocatedJournalsCSVContent(entity));
outputFileName += "_unlocated-journals" + ".csv";
outputFileName += "_unmapped-journals" + ".csv";
} else {
@ -561,14 +561,14 @@ public class MapOfScienceVisualizationRequestHandler implements
StringBuilder csvFileContent = new StringBuilder();
csvFileContent.append("Journal, Publication Count\n");
csvFileContent.append("Publication Venue, Publication Count\n");
PublicationJournalStats stats = extractScienceMappingResultFromActivities(subjectEntity);
ScienceMappingResult result = stats.scienceMapping;
DecimalFormat percentageActivityFormat = new DecimalFormat("#.#");
csvFileContent.append(StringEscapeUtils.escapeCsv("No Journal"));
csvFileContent.append(StringEscapeUtils.escapeCsv("No Publication Venue Name"));
csvFileContent.append(", ");
csvFileContent.append(percentageActivityFormat.format(stats.noJournalCount));
csvFileContent.append("\n");