'); - parentP.attr('id', slugify(entity.label)); + parentP.attr('id', slugify(entity.entityURI)); var labelDiv = $('
| '); entityLabelTH.html('Entity Name'); - var publicationCountTH = $(' | '); + var activityCountTH = $(' | '); if ($("select.comparisonValues option:selected").text() === "by Publications") { - publicationCountTH.html('Publication Count'); + activityCountTH.html('Publication Count'); } else { - publicationCountTH.html('Grant Count'); + activityCountTH.html('Grant Count'); } + activityCountTH.attr("id", "activity-count-column"); var entityTypeTH = $(' | '); entityTypeTH.html('Entity Type'); tr.append(checkboxTH); tr.append(entityLabelTH); - tr.append(publicationCountTH); + tr.append(activityCountTH); tr.append(entityTypeTH); thead.append(tr); @@ -1005,20 +1053,26 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){ table.append(thead); var tbody = $(' | '); + var checkboxCount = 0; - $.each(labelToEntityRecord, function(index, val){ + $.each(URIToEntityRecord, function(index, val) { var entityTypesWithoutStopWords = removeStopWords(val); var row = $('
|---|---|---|---|
| ');
- checkboxTD.html(' | '); labelTD.css("width", "100px"); - labelTD.html(index); + labelTD.html(val.label); var publicationCountTD = $(' | '); - publicationCountTD.html(calcSumOfComparisonParameter(val)); + + var combinedCount = calcSumOfComparisonParameter(val); + + publicationCountTD.html(combinedCount.knownYearCount + combinedCount.unknownYearCount); var entityTypeTD = $(' | ');
entityTypeTD.html(entityTypesWithoutStopWords);
@@ -1076,6 +1130,91 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
}
+
+/*
+ * function to create a table to be
+ * used by jquery.dataTables. The JsonObject
+ * returned is used to populate the pagination table.
+ */
+function reloadDataTablePagination(preselectedEntityURIs, jsonData){
+
+ resetStopWordCount();
+
+ /*
+ * In case no entities are selected, we want that redraw should happen so that top entities are
+ * pre-selected.
+ * */
+ var shouldRedraw = preselectedEntityURIs.length ? false : true;
+
+ var currentDataTable = $('#datatable').dataTable();
+
+ currentDataTable.fnClearTable();
+
+ if ($("select.comparisonValues option:selected").text() === "by Publications") {
+ $("#activity-count-column").html('Publication Count');
+ } else {
+ $("#activity-count-column").html('Grant Count');
+ }
+
+ function addNewRowAfterReload(entity) {
+
+ var checkboxTD = '
+
+
@@ -84,5 +90,9 @@
+
+ Legend + Known ${currentParameterObject.name} year+ Unknown ${currentParameterObject.name} year \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl index 9a1de299..dd88f20d 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl @@ -5,6 +5,12 @@ corresponding changes in the included Templates. --> <#assign currentParameter = "grant"> + + <#include "entityComparisonSetup.ftl"> <#assign temporalGraphDownloadFileLink = '${temporalGraphDownloadCSVCommonURL}&vis=entity_grant_count'> diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl index be1b6eb1..abd59d55 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl @@ -5,6 +5,12 @@ corresponding changes in the included Templates. --> <#assign currentParameter = "publication"> + + <#include "entityComparisonSetup.ftl"> <#assign temporalGraphDownloadFileLink = '${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison'> diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index 799d6b93..c8a46376 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -13,20 +13,27 @@ <#assign subOrganizationPublicationTemporalGraphCommonURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_comparison"> <#assign organizationPublicationTemporalGraphURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_comparison&uri=${organizationURI}"> +<#assign organizationPublicationTemporalGraphDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=entity_comparison&uri=${organizationURI}&vis_mode=json"> + <#assign organizationGrantTemporalGraphURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}"> +<#assign organizationGrantTemporalGraphDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}&vis_mode=json"> <#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> <#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> <#assign publicationParameter = { "name": "publication", + "pluralName": "publications", "dropDownText": "by Publications", - "viewLink": "${organizationPublicationTemporalGraphURL}", + "viewLink": "${organizationPublicationTemporalGraphURL}", + "dataLink": "${organizationPublicationTemporalGraphDataURL}", "value": "Publications" }> - + <#assign grantParameter = { "name": "grant", + "pluralName": "grants", "dropDownText": "by Grants", "viewLink": "${organizationGrantTemporalGraphURL}", + "dataLink": "${organizationGrantTemporalGraphDataURL}", "value": "Grants" }> <#assign parameterOptions = [publicationParameter, grantParameter]> @@ -42,6 +49,15 @@ we will default to using the stable version unless the request comes from IE 9 i we will use rev 293 (dev build version) of the flot & excanvas files. --> + + ${scripts.add('', '', '', @@ -50,6 +66,7 @@ ${scripts.add(' diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java index 034ea98b..8179fd46 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java @@ -15,7 +15,6 @@ import org.apache.commons.logging.Log; import com.google.gson.Gson; import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -27,7 +26,6 @@ import edu.cornell.mannlib.vitro.webapp.visualization.constants.VOConstants; import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.entitycomparison.EntityComparisonUtilityFunctions; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity; -import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.ConstructedModelTracker; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Entity; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.JsonObject; import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SubEntity; @@ -58,11 +56,11 @@ public class TemporalPublicationVisualizationRequestHandler implements } - System.out.println("current models in the system are"); - for (Map.Entry |