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

NIHVIVO-2082 Made two corrections in the hard-coded literals activity type query filter: a variable was incorrectly named, and some of the select values had spaces in them. Now the activity type query returns a result, which populates the type form field and allows the activity type and label to appear in the form.

Browse source
This commit is contained in:
rjy7 2011-02-09 19:12:49 +00:00
parent b63c4f2be7
commit eb54a55efe
8 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
productMods/edit/forms/addClinicalRoleToPerson.jsp
View file

@ -5,5 +5,8 @@
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
<jsp:param name="roleActivityType_literalOptions"
value='["", "Select one"],
["http://vivoweb.org/ontology/core#Project", "Project" ],
[ "http://vivoweb.org/ontology/core#Service","Service"] ' />
</jsp:include>

6
productMods/edit/forms/addHeadOfRoleToPerson.jsp
View file

@ -11,14 +11,14 @@
value='["", "Select one"],
[ "http://vivoweb.org/ontology/core#Association", "Association" ],
[ "http://vivoweb.org/ontology/core#Center", "Center" ],
[ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
[ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
[ "http://vivoweb.org/ontology/core#College", "College" ],
[ "http://vivoweb.org/ontology/core#Committee", "Committee" ],
[ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
[ "http://vivoweb.org/ontology/core#Department", "Department" ],
[ "http://vivoweb.org/ontology/core#Division", "Division" ],
[ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ],
[ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
[ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ],
[ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
[ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
[ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
@ -36,6 +36,6 @@
[ "http://vivoweb.org/ontology/core#School", "School" ],
[ "http://vivoweb.org/ontology/core#Service","Service"],
[ "http://vivoweb.org/ontology/core#Team", "Team" ],
[ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
[ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ],
[ "http://vivoweb.org/ontology/core#University", "University" ]' />
</jsp:include>

6
productMods/edit/forms/addOutreachRoleToPerson.jsp
View file

@ -10,14 +10,14 @@
value='["", "Select one"],
[ "http://vivoweb.org/ontology/core#Association", "Association" ],
[ "http://vivoweb.org/ontology/core#Center", "Center" ],
[ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
[ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
[ "http://vivoweb.org/ontology/core#College", "College" ],
[ "http://vivoweb.org/ontology/core#Committee", "Committee" ],
[ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
[ "http://vivoweb.org/ontology/core#Department", "Department" ],
[ "http://vivoweb.org/ontology/core#Division", "Division" ],
[ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ],
[ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
[ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ],
[ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
[ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
[ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
@ -35,6 +35,6 @@
[ "http://vivoweb.org/ontology/core#Team", "Team" ],
[ "http://vivoweb.org/ontology/core#School", "School" ],
[ "http://vivoweb.org/ontology/core#Service","Service"],
[ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
[ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ],
[ "http://vivoweb.org/ontology/core#University", "University" ]' />
</jsp:include>

5
productMods/edit/forms/addPresenterRoleToPerson.jsp
View file

@ -8,5 +8,8 @@
<jsp:param name="numDateFields" value="1" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
<jsp:param name="roleActivityType_literalOptions"
value='["", "Select one"],
["http://vivoweb.org/ontology/core#Presentation", "Presentation" ],
[ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
</jsp:include>

5
productMods/edit/forms/addResearcherRoleToPerson.jsp
View file

@ -6,5 +6,8 @@
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
<jsp:param name="roleActivityType_literalOptions"
value='["", "Select one"],
["http://vivoweb.org/ontology/core#Grant", "Grant" ],
[ "http://vivoweb.org/ontology/core#Project","Project"] ' />
</jsp:include>

2
productMods/edit/forms/addRoleToPersonTwoStage.jsp
View file

@ -580,7 +580,7 @@ private String getActivityTypeQuery(VitroRequest vreq) {
JSONArray option = values.getJSONArray(i);
String uri = option.getString(0);
if (StringUtils.isNotBlank(uri)) {
typeUris.add("(?existingTypeActivity = \"" + uri + "\")");
typeUris.add("(?existingActivityType = <" + uri + ">)");
}
}
String typeFilters = "FILTER (" + StringUtils.join(typeUris, "||") + ")";

6
productMods/edit/forms/addServiceProviderRoleToPerson.jsp
View file

@ -10,14 +10,14 @@
value='["", "Select one"],
[ "http://vivoweb.org/ontology/core#Association", "Association" ],
[ "http://vivoweb.org/ontology/core#Center", "Center" ],
[ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
[ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
[ "http://vivoweb.org/ontology/core#College", "College" ],
[ "http://vivoweb.org/ontology/core#Committee", "Committee" ],
[ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
[ "http://vivoweb.org/ontology/core#Department", "Department" ],
[ "http://vivoweb.org/ontology/core#Division", "Division" ],
[ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ],
[ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
[ "http://vivoweb.org/ontology/core#ExtensionUnit", "Extension Unit" ],
[ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
[ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
[ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
@ -35,6 +35,6 @@
[ "http://vivoweb.org/ontology/core#Team", "Team" ],
[ "http://vivoweb.org/ontology/core#School", "School" ],
[ "http://vivoweb.org/ontology/core#Service","Service"],
[ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
[ "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization" ],
[ "http://vivoweb.org/ontology/core#University", "University" ]' />
</jsp:include>

6
productMods/edit/forms/addTeacherRoleToPerson.jsp
View file

@ -6,5 +6,9 @@
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
<jsp:param name="roleActivityType_literalOptions"
value='["", "Select one"],
["http://purl.org/ontology/bibo/Conference", "Conference" ],
[ "http://vivoweb.org/ontology/core#Course","Course"],
[ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
</jsp:include>