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

1. Improved layout for map of science.

Browse source 
2. Made sure that all sub-disciplines & disciplines are exported in the csv file even though they dont have any associated value.
This commit is contained in:
tankchintan 2011-07-13 17:38:26 +00:00
parent 0e2adb8e17
commit dbdf2de95b
3 changed files with 56 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
productMods/css/visualization/mapofscience/layout.css
View file

@ -48,19 +48,6 @@ font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-seri
padding-bottom:10px;
}
a.map-of-science-links {
background-color: #2485AE;
color: white;
cursor: pointer;
font-weight: bold;
height: 20px;
margin-top: 10px;
padding: 4px 50px 3px;
text-align: center;
text-decoration: none;
padding-bottom: 3px;
}
a.clear-selected-entities {
background-color: #878787;
}
@ -153,6 +140,14 @@ a.clear-selected-entities {
}
hr.subtle-hr {
background-color: #BDBDBD;
border: 0 none;
height: 1px;
margin-bottom: 15px;
margin-top: 15px;
}
#main-science-areas-table-container table {
cellpadding: 0;
cellspacing: 0;
@ -174,11 +169,21 @@ table.datatable-table tbody tr {
border-top: 3px solid;
}
a.map-of-science-links {
color: white;
cursor: pointer;
font-weight: bold;
text-decoration: none;
}
#main-science-areas-table-footer {
margin-top: 10px;
text-align: left;
text-align: center;
height: 25px;
width: 500px;
max-width: 260px;
background-color: #2485AE;
height: 20px;
padding: 4px 5px 3px;
}
#main-science-areas-table-container {

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

@ -52,8 +52,11 @@ corresponding changes in the included Templates. -->
</div>
<div id="main-science-areas-table-container"></div>
<hr class="subtle-hr"/>
<div id="main-science-areas-table-footer">
<a id="csv" href="${entityMapOfScienceDisciplineCSVURL}" class="map-of-science-links">Export Complete Table</a>
<a id="csv" href="${entityMapOfScienceDisciplineCSVURL}" class="map-of-science-links">Export All Sub-Disciplines</a>
<#-- <a class="clear-selected-entities map-of-science-links" title="Clear all selected entities.">Clear</a> -->
</div>
</div>

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

@ -535,6 +535,21 @@ public class MapOfScienceVisualizationRequestHandler implements
csvFileContent.append("\n");
}
for (Map.Entry<Integer, String> currentDiscipline : MapOfScienceConstants.DISCIPLINE_ID_TO_LABEL.entrySet()) {
Float currentDisciplineValue = disciplineToPublicationCount.get(currentDiscipline.getKey());
if (currentDisciplineValue == null) {
csvFileContent.append(StringEscapeUtils.escapeCsv(currentDiscipline.getValue()));
csvFileContent.append(", ");
csvFileContent.append(0);
csvFileContent.append(", ");
csvFileContent.append(0);
csvFileContent.append("\n");
}
}
return csvFileContent.toString();
}
@ -555,7 +570,9 @@ public class MapOfScienceVisualizationRequestHandler implements
totalMappedPublications = result.getMappedPublications();
for (Map.Entry<Integer, Float> currentMappedSubdiscipline : result.getMappedResult().entrySet()) {
Map<Integer, Float> mappedResult = result.getMappedResult();
for (Map.Entry<Integer, Float> currentMappedSubdiscipline : mappedResult.entrySet()) {
csvFileContent.append(StringEscapeUtils.escapeCsv(MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_LABEL
.get(currentMappedSubdiscipline.getKey())));
@ -570,6 +587,20 @@ public class MapOfScienceVisualizationRequestHandler implements
}
csvFileContent.append("\n");
}
for (Map.Entry<Integer, String> currentSubdiscipline : MapOfScienceConstants.SUB_DISCIPLINE_ID_TO_LABEL.entrySet()) {
Float currentMappedSubdisciplineValue = mappedResult.get(currentSubdiscipline.getKey());
if (currentMappedSubdisciplineValue == null) {
csvFileContent.append(StringEscapeUtils.escapeCsv(currentSubdiscipline.getValue()));
csvFileContent.append(", ");
csvFileContent.append(0);
csvFileContent.append(", ");
csvFileContent.append(0);
csvFileContent.append("\n");
}
}
}
return csvFileContent.toString();