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

hasAttendeeRole now uses role list view; removed unnecessary brackets from selects

Browse source
This commit is contained in:
tworrall 2011-11-17 21:00:57 +00:00
parent b07c7b0156
commit f362f7ce2d
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
View file

@ -60,6 +60,7 @@
** core:hasResearcherRole ** core:hasResearcherRole
** core:hasTeacherRole ** core:hasTeacherRole
** core:hasOrganizerRole ** core:hasOrganizerRole
** core:hasAttendeeRole
these three are an exception, and share a separate config these three are an exception, and share a separate config
** core:hasInvestigatorRole ** core:hasInvestigatorRole
** core:hasCo-PrincipalInvestigatorRole ** core:hasCo-PrincipalInvestigatorRole
@ -98,6 +99,10 @@
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile> <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description> </rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasAttendeeRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<!-- The next two roles may not have a "role in" anything --> <!-- The next two roles may not have a "role in" anything -->
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasEditorRole"> <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasEditorRole">

10
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
View file

@ -155,8 +155,10 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
); );
conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField")); conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
//Adding additional data, specifically edit mode //Adding additional data, specifically edit mode
addFormSpecificData(conf, vreq); addFormSpecificData(conf, vreq);
return conf; return conf;
} }
@ -240,12 +242,12 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
final static String existingIntervalNodeQuery = final static String existingIntervalNodeQuery =
"SELECT ?existingIntervalNode WHERE { \n" + "SELECT ?existingIntervalNode WHERE { \n" +
" ?position <${positionToInterval}> ?existingIntervalNode . \n" + " ?position <" + positionToInterval + "> ?existingIntervalNode . \n" +
" ?existingIntervalNode a <" + intervalType + "> . }"; " ?existingIntervalNode a <" + intervalType + "> . }";
final static String existingStartNodeQuery = final static String existingStartNodeQuery =
"SELECT ?existingStartNode WHERE { \n" + "SELECT ?existingStartNode WHERE { \n" +
" ?position <${positionToInterval}> ?intervalNode . \n" + " ?position <" + positionToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n" + " ?intervalNode a <" + intervalType + "> . \n" +
" ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" + " ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
" ?existingStartNode a <" + dateTimeValueType + "> .} "; " ?existingStartNode a <" + dateTimeValueType + "> .} ";
@ -262,8 +264,8 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
" ?position <" + positionToInterval + "> ?intervalNode . \n" + " ?position <" + positionToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n" + " ?intervalNode a <" + intervalType + "> . \n" +
" ?intervalNode <" + intervalToStart + "> ?startNode . \n" + " ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
" ?startNode a <${dateTimeValueType}> . \n" + " ?startNode a <" + dateTimeValueType + "> . \n" +
" ?startNode <${dateTimePrecision}> ?existingStartPrecision . }"; " ?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
final static String existingEndPrecisionQuery = final static String existingEndPrecisionQuery =
"SELECT ?existingEndPrecision WHERE { \n" + "SELECT ?existingEndPrecision WHERE { \n" +