diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java index 00808e5c..a23af95c 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalGrantVisualizationRequestHandler.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -157,13 +158,13 @@ public class TemporalGrantVisualizationRequestHandler implements Set orgGrants = new HashSet(); Set orgGrantsPeople = new HashSet(); - Map> subOrgPublicationsMap = new HashMap>(); + Map> subOrgGrantsMap = new HashMap>(); OrgUtils.getObjectMappingsForOrgAnSubOrgs( subjectEntityURI, orgGrants, orgGrantsPeople, - subOrgPublicationsMap, + subOrgGrantsMap, subOrgMap, organisationToPeopleMap, personToGrantMap @@ -183,15 +184,19 @@ public class TemporalGrantVisualizationRequestHandler implements Set subEntitiesJson = new HashSet(); // For each suborganisation - for (String subOrg : subOrgPublicationsMap.keySet()) { + for (String subOrg : subOrgGrantsMap.keySet()) { JsonObject entityJson = new JsonObject(orgLabelMap.get(subOrg)); - List> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgPublicationsMap.get(subOrg), grantToYearMap); + if (subOrgGrantsMap.containsKey(subOrg)) { + List> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgGrantsMap.get(subOrg), grantToYearMap); + entityJson.setYearToActivityCount(yearPubCounts); + } else { + entityJson.setYearToActivityCount(new ArrayList>()); + } String type = orgMostSpecificLabelMap.get(subOrg); - - entityJson.setYearToActivityCount(yearPubCounts); entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Organization" : type)); + entityJson.setEntityURI(subOrg); entityJson.setVisMode("ORGANIZATION"); @@ -202,12 +207,16 @@ public class TemporalGrantVisualizationRequestHandler implements for (String person : orgGrantsPeople) { JsonObject entityJson = new JsonObject(personLabelMap.get(person)); - List> yearPubCounts = CounterUtils.getObjectCountByYear(personToGrantMap.get(person), grantToYearMap); + if (personToGrantMap.containsKey(person)) { + List> yearPubCounts = CounterUtils.getObjectCountByYear(personToGrantMap.get(person), grantToYearMap); + entityJson.setYearToActivityCount(yearPubCounts); + } else { + entityJson.setYearToActivityCount(new ArrayList>()); + } String type = personMostSpecificLabelMap.get(person); - - entityJson.setYearToActivityCount(yearPubCounts); entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Person" : type)); + entityJson.setEntityURI(person); entityJson.setVisMode("PERSON"); @@ -234,11 +243,11 @@ public class TemporalGrantVisualizationRequestHandler implements csvFileContent.append("Entity Name, Grant Count, Entity Type\n"); - for (String subOrg : subOrgPublicationsMap.keySet()) { + for (String subOrg : subOrgGrantsMap.keySet()) { csvFileContent.append(StringEscapeUtils.escapeCsv(orgLabelMap.get(subOrg))); csvFileContent.append(", "); - csvFileContent.append(subOrgPublicationsMap.get(subOrg).size()); + csvFileContent.append(subOrgGrantsMap.get(subOrg).size()); csvFileContent.append(", "); csvFileContent.append("Organization"); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java index 452ece12..d82b5648 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/TemporalPublicationVisualizationRequestHandler.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.visualization.temporalgraph; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -126,12 +127,16 @@ public class TemporalPublicationVisualizationRequestHandler implements for (String subOrg : subOrgPublicationsMap.keySet()) { JsonObject entityJson = new JsonObject(orgLabelMap.get(subOrg)); - List> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgPublicationsMap.get(subOrg), publicationToYearMap); + if (subOrgPublicationsMap.containsKey(subOrg)) { + List> yearPubCounts = CounterUtils.getObjectCountByYear(subOrgPublicationsMap.get(subOrg), publicationToYearMap); + entityJson.setYearToActivityCount(yearPubCounts); + } else { + entityJson.setYearToActivityCount(new ArrayList>()); + } String type = orgMostSpecificLabelMap.get(subOrg); - - entityJson.setYearToActivityCount(yearPubCounts); entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Organization" : type)); + entityJson.setEntityURI(subOrg); entityJson.setVisMode("ORGANIZATION"); @@ -142,12 +147,16 @@ public class TemporalPublicationVisualizationRequestHandler implements for (String person : orgPublicationsPeople) { JsonObject entityJson = new JsonObject(personLabelMap.get(person)); - List> yearPubCounts = CounterUtils.getObjectCountByYear(personToPublicationMap.get(person), publicationToYearMap); + if (personToPublicationMap.containsKey(person)) { + List> yearPubCounts = CounterUtils.getObjectCountByYear(personToPublicationMap.get(person), publicationToYearMap); + entityJson.setYearToActivityCount(yearPubCounts); + } else { + entityJson.setYearToActivityCount(new ArrayList>()); + } String type = personMostSpecificLabelMap.get(person); - - entityJson.setYearToActivityCount(yearPubCounts); entityJson.setOrganizationTypes(Arrays.asList(type == null ? "Person" : type)); + entityJson.setEntityURI(person); entityJson.setVisMode("PERSON"); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java index 5472bd23..e90f6386 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/OrgUtils.java @@ -65,8 +65,8 @@ public class OrgUtils { Set people = organisationToPeopleMap.get(orgUri); if (people != null) { for (String person : people) { - if (personToObjectMap.containsKey(person)) { - if (orgObjectsIncludesPeople.add(person)) { + if (orgObjectsIncludesPeople.add(person)) { + if (personToObjectMap.containsKey(person)) { orgObjects.addAll(personToObjectMap.get(person)); } } diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html index da903d52..423555e9 100644 --- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html +++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html @@ -1249,7 +1249,7 @@ verifyTextPresent - Select an existing Document Part for Nintendo O.K. for Kids + Select an existing document for Nintendo O.K. for Kids @@ -1983,7 +1983,7 @@ - verifyTextPresent + verifyTextNotPresent Select an existing (Instrument or Service or Reagent or Research Project or Biological Specimen or Software or Database) for Nintendo O.K. for Kids @@ -2023,7 +2023,7 @@ - verifyTextPresent + verifyTextNotPresent Select an existing (Instrument or Service or Reagent or Research Project or Biological Specimen or Software or Database) for Nintendo O.K. for Kids @@ -2079,7 +2079,7 @@ - verifyTextPresent + verifyTextNotPresent Select an existing Global Citation Count for Nintendo O.K. for Kids @@ -2119,7 +2119,7 @@ - verifyTextPresent + verifyTextNotPresent Select an existing Global Citation Count for Nintendo O.K. for Kids @@ -2170,7 +2170,7 @@ - verifyTextPresent + verifyTextNotPresent Select an existing Event for Nintendo O.K. for Kids @@ -2230,7 +2230,7 @@ - verifyTextPresent + verifyTextNotPresent Select an existing Event for Nintendo O.K. for Kids @@ -2301,7 +2301,7 @@ - verifyTextPresent + verifyTextNotPresent Select an existing Process for Nintendo O.K. for Kids @@ -2363,7 +2363,7 @@ verifyTextPresent - Select an existing Document for Nintendo O.K. for Kids + Select an existing document for Nintendo O.K. for Kids @@ -2398,7 +2398,7 @@ verifyTextPresent - Select an existing Document for Nintendo O.K. for Kids + Select an existing document for Nintendo O.K. for Kids @@ -2469,7 +2469,7 @@ verifyTextPresent - Select an existing Document for Nintendo O.K. for Kids + Select an existing document for Nintendo O.K. for Kids diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html index 7efd01d0..851525e0 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddPublications.html @@ -261,6 +261,11 @@ Nintendo: Good or Bad for Kids? + + pause + 3000 + + clickAndWait diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html index c9dfbe79..c7e9908a 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddTestFaculty.html @@ -132,6 +132,11 @@ Furter, Frank + + pause + 3000 + + verifyTextPresent diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html index 89d07274..e27095e1 100644 --- a/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html +++ b/utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html @@ -640,16 +640,6 @@ Regenerate Constructed Models - - clickAndWait - link=Child Development - - - - assertTitle - Child Development - - clickAndWait @@ -943,16 +933,6 @@ Regenerate Constructed Models - - clickAndWait - link=Child Development - - - - assertTitle - Child Development - - clickAndWait @@ -1115,21 +1095,6 @@ Regenerate Constructed Models - - clickAndWait - link=College of Human Ecology - - - - assertTitle - College of Human Ecology - - - - clickAndWait - link=Site Admin - - clickAndWait