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

Adding date time with precision to grant form NIHVIVO-1915

Browse source
This commit is contained in:
bdc34 2011-01-27 18:33:03 +00:00
parent b65c2bccbe
commit 764a3bde2a
1 changed files with 138 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

177
productMods/edit/forms/addGrantRoleToPerson.jsp
View file

@ -48,7 +48,10 @@ This is intended to create a set of statements like:
String predicateUri = (String)request.getAttribute("predicateUri"); String predicateUri = (String)request.getAttribute("predicateUri");
ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri ); ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri );
if( op != null && op.getURIInverse() != null ){ if( op != null && op.getURIInverse() != null ){
%> <c:set var="inversePredicate"><%=op.getURIInverse()%></c:set> <% %>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.DateTimeIntervalValidation"%><c:set var="inversePredicate"><%=op.getURIInverse()%></c:set> <%
}else{ }else{
%> <c:set var="inversePredicate"></c:set> <% %> <c:set var="inversePredicate"></c:set> <%
} }
@ -82,9 +85,22 @@ This is intended to create a set of statements like:
<%@page import="edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty"%><c:set var="vivoOnt" value="http://vivoweb.org/ontology" /> <%@page import="edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty"%><c:set var="vivoOnt" value="http://vivoweb.org/ontology" />
<c:set var="vivoCore" value="${vivoOnt}/core#" /> <c:set var="vivoCore" value="${vivoOnt}/core#" />
<c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" /> <c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
<c:set var="type" value="<%= VitroVocabulary.RDF_TYPE %>" />
<c:set var="rdf" value="<%= VitroVocabulary.RDF %>" /> <c:set var="rdf" value="<%= VitroVocabulary.RDF %>" />
<c:set var="label" value="${rdfs}label" /> <c:set var="label" value="${rdfs}label" />
<c:set var="startYearPred" value="${vivoCore}startYear" />
<c:set var="endYearPred" value="${vivoCore}endYear" />
<c:set var="dateTimeValueType" value="${vivoCore}DateTimeValue"/>
<c:set var="dateTimePrecision" value="${vivoCore}dateTimePrecision"/>
<c:set var="dateTimeValue" value="${vivoCore}dateTime"/>
<c:set var="roleToInterval" value="${vivoCore}dateTimeInterval"/>
<c:set var="intervalType" value="${vivoCore}DateTimeInterval"/>
<c:set var="intervalToStart" value="${vivoCore}start"/>
<c:set var="intervalToEnd" value="${vivoCore}end"/>
<% // set role type based on predicate <% // set role type based on predicate
String subjectName = ((Individual) request.getAttribute("subject")).getName(); String subjectName = ((Individual) request.getAttribute("subject")).getName();
if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvestigatorRole") ) { %> if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvestigatorRole") ) { %>
@ -124,16 +140,6 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<c:set var="startYearUri" value="${vivoCore}startYear" />
<v:jsonset var="startYearAssertion" >
?role <${startYearUri}> ?startYear .
</v:jsonset>
<c:set var="endYearUri" value="${vivoCore}endYear" />
<v:jsonset var="endYearAssertion" >
?role <${endYearUri}> ?endYear .
</v:jsonset>
<v:jsonset var="n3ForGrantRole"> <v:jsonset var="n3ForGrantRole">
@prefix core: <${vivoCore}> . @prefix core: <${vivoCore}> .
@prefix rdf: <${rdf}> . @prefix rdf: <${rdf}> .
@ -152,6 +158,24 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
?role ?inverseRolePredicate ?person. ?role ?inverseRolePredicate ?person.
</v:jsonset> </v:jsonset>
<v:jsonset var="n3ForStart">
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToStart}> ?startNode .
?startNode <${type}> <${dateTimeValueType}> .
?startNode <${dateTimeValue}> ?startField.value .
?startNode <${dateTimePrecision}> ?startField.precision .
</v:jsonset>
<v:jsonset var="n3ForEnd">
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToEnd}> ?endNode .
?endNode <${type}> <${dateTimeValueType}> .
?endNode <${dateTimeValue}> ?endField.value .
?endNode <${dateTimePrecision}> ?endField.precision .
</v:jsonset>
<v:jsonset var="n3ForGrantLabel"> <v:jsonset var="n3ForGrantLabel">
@prefix rdfs: <${rdfs}> . @prefix rdfs: <${rdfs}> .
?grant rdfs:label ?grantLabel . ?grant rdfs:label ?grantLabel .
@ -165,22 +189,72 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
?existingGrant rdfs:label ?existingGrantLabel . } ?existingGrant rdfs:label ?existingGrantLabel . }
</v:jsonset> </v:jsonset>
<v:jsonset var="startYearQuery">
PREFIX core: <${vivoCore}>
SELECT ?existingStartYear WHERE { ?role core:startYear ?existingStartYear .}
</v:jsonset>
<v:jsonset var="endYearQuery">
PREFIX core: <${vivoCore}>
SELECT ?existingStartYear WHERE { ?role core:endYear ?existingStartYear .}
</v:jsonset>
<v:jsonset var="grantQuery"> <v:jsonset var="grantQuery">
PREFIX core: <${vivoCore}> PREFIX core: <${vivoCore}>
SELECT ?existingGrant WHERE { ?role core:roleIn ?existingGrant . } SELECT ?existingGrant WHERE { ?role core:roleIn ?existingGrant . }
</v:jsonset> </v:jsonset>
<v:jsonset var="grantTypeUriJson">${vivoOnt}#Grant</v:jsonset> <v:jsonset var="grantTypeUriJson">${vivoOnt}#Grant</v:jsonset>
<v:jsonset var="existingIntervalNodeQuery" >
SELECT ?existingIntervalNode WHERE {
?role <${roleToInterval}> ?existingIntervalNode .
?existingIntervalNode <${type}> <${intervalType}> . }
</v:jsonset>
<v:jsonset var="existingStartNodeQuery" >
SELECT ?existingStartNode WHERE {
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToStart}> ?existingStartNode .
?existingStartNode <${type}> <${dateTimeValueType}> .}
</v:jsonset>
<v:jsonset var="existingStartDateQuery" >
SELECT ?existingDateStart WHERE {
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToStart}> ?startNode .
?startNode <${type}> <${dateTimeValueType}> .
?startNode <${dateTimeValue}> ?existingDateStart . }
</v:jsonset>
<v:jsonset var="existingStartPrecisionQuery" >
SELECT ?existingStartPrecision WHERE {
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToStart}> ?startNode .
?startNode <${type}> <${dateTimeValueType}> .
?startNode <${dateTimePrecision}> ?existingStartPrecision . }
</v:jsonset>
<v:jsonset var="existingEndNodeQuery" >
SELECT ?existingEndNode WHERE {
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToEnd}> ?existingEndNode .
?existingEndNode <${type}> <${dateTimeValueType}> .}
</v:jsonset>
<v:jsonset var="existingEndDateQuery" >
SELECT ?existingEndDate WHERE {
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToEnd}> ?endNode .
?endNode <${type}> <${dateTimeValueType}> .
?endNode <${dateTimeValue}> ?existingEndDate . }
</v:jsonset>
<v:jsonset var="existingEndPrecisionQuery" >
SELECT ?existingEndPrecision WHERE {
?role <${roleToInterval}> ?intervalNode .
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToEnd}> ?endNode .
?endNode <${type}> <${dateTimeValueType}> .
?endNode <${dateTimePrecision}> ?existingEndPrecision . }
</v:jsonset>
<c:set var="editjson" scope="request"> <c:set var="editjson" scope="request">
{ {
"formUrl" : "${formUrl}", "formUrl" : "${formUrl}",
@ -191,23 +265,36 @@ PREFIX core: <${vivoCore}>
"predicate" : ["rolePredicate", "${predicateUriJson}" ], "predicate" : ["rolePredicate", "${predicateUriJson}" ],
"object" : ["role", "${objectUriJson}", "URI" ], "object" : ["role", "${objectUriJson}", "URI" ],
"n3required" : [ "${n3ForGrantRole}", "${startYearAssertion}" ], "n3required" : [ "${n3ForGrantRole}" ],
"n3optional" : [ "${n3ForGrantLabel}", "${n3ForInverse}", "${endYearAssertion}" ], "n3optional" : [ "${n3ForGrantLabel}", "${n3ForInverse}", "${n3ForStart}", "${n3ForEnd}" ],
"newResources" : { "role" : "${defaultNamespace}", "newResources" : { "role" : "${defaultNamespace}",
"grant" : "${defaultNamespace}" }, "grant" : "${defaultNamespace}",
"intervalNode" : "${defaultNamespace}",
"startNode" : "${defaultNamespace}",
"endNode" : "${defaultNamespace}" },
"urisInScope" : { "roleType" : "${roleType}", "urisInScope" : { "roleType" : "${roleType}",
"inverseRolePredicate" : "${inversePredicate}" }, "inverseRolePredicate" : "${inversePredicate}" },
"literalsInScope": { }, "literalsInScope": { },
"urisOnForm" : [ "grant" ], "urisOnForm" : [ "grant" ],
"literalsOnForm" : [ "grantLabel", "startYear", "endYear", "existingGrantLabel" ], "literalsOnForm" : [ "grantLabel", "existingGrantLabel" ],
"filesOnForm" : [ ], "filesOnForm" : [ ],
"sparqlForLiterals" : { }, "sparqlForLiterals" : { },
"sparqlForUris" : { }, "sparqlForUris" : { },
"sparqlForExistingLiterals" : { "grantLabel":"${grantLabelQuery}" , "startYear":"${startYearQuery}", "endYear":"${endYearQuery}" }, "sparqlForExistingLiterals" : {
"sparqlForExistingUris" : { "grant":"${grantQuery}" }, "grantLabel":"${grantLabelQuery}" ,
"startField.value" : "${existingStartDateQuery}",
"endField.value" : "${existingEndDateQuery}"
},
"sparqlForExistingUris" : {
"grant":"${grantQuery}",
"intervalNode" : "${existingIntervalNodeQuery}",
"startNode" : "${existingStartNodeQuery}",
"endNode" : "${existingEndNodeQuery}",
"startField.precision": "${existingStartPrecisionQuery}",
"endField.precision" : "${existingEndPrecisionQuery}"
},
"fields" : { "fields" : {
"grant" : { "grant" : {
"newResource" : "false", "newResource" : "false",
@ -242,27 +329,27 @@ PREFIX core: <${vivoCore}>
"rangeLang" : "", "rangeLang" : "",
"assertions" : [ ] "assertions" : [ ]
}, },
"startYear" : { "startField" : {
"newResource" : "false", "newResource" : "false",
"validators" : [ "nonempty", "datatype:${gYearDatatypeUriJson}" ], "validators" : [ ],
"optionsType" : "UNDEFINED", "optionsType" : "UNDEFINED",
"literalOptions" : [ ], "literalOptions" : [ ],
"predicateUri" : "", "predicateUri" : "",
"objectClassUri" : "", "objectClassUri" : "",
"rangeDatatypeUri" : "${gYearDatatypeUriJson}", "rangeDatatypeUri" : "",
"rangeLang" : "", "rangeLang" : "",
"assertions" : ["${startYearAssertion}"] "assertions" : [ "${n3ForStart}" ]
}, },
"endYear" : { "endField" : {
"newResource" : "false", "newResource" : "false",
"validators" : [ "datatype:${gYearDatatypeUriJson}" ], "validators" : [ ],
"optionsType" : "UNDEFINED", "optionsType" : "UNDEFINED",
"literalOptions" : [ ], "literalOptions" : [ ],
"predicateUri" : "", "predicateUri" : "",
"objectClassUri" : "", "objectClassUri" : "",
"rangeDatatypeUri" : "${gYearDatatypeUriJson}", "rangeDatatypeUri" : "",
"rangeLang" : "", "rangeLang" : "",
"assertions" : ["${endYearAssertion}"] "assertions" : ["${n3ForEnd}" ]
} }
} }
} }
@ -275,10 +362,20 @@ PREFIX core: <${vivoCore}>
if (editConfig == null) { if (editConfig == null) {
editConfig = new EditConfiguration((String) request.getAttribute("editjson")); editConfig = new EditConfiguration((String) request.getAttribute("editjson"));
EditConfiguration.putConfigInSession(editConfig,session); EditConfiguration.putConfigInSession(editConfig,session);
//setup date time edit elements
Field startField = editConfig.getField("startField");
startField.setEditElement(
new DateTimeWithPrecision(startField,
VitroVocabulary.Precision.YEAR.uri(),
VitroVocabulary.Precision.NONE.uri()));
Field endField = editConfig.getField("endField");
endField.setEditElement(
new DateTimeWithPrecision(endField,
VitroVocabulary.Precision.YEAR.uri(),
VitroVocabulary.Precision.NONE.uri()));
editConfig.addValidator(new DateTimeIntervalValidation("startField","endField") );
} }
editConfig.addValidator(new StartYearBeforeEndYear("startYear","endYear") );
Model model = (Model) application.getAttribute("jenaOntModel"); Model model = (Model) application.getAttribute("jenaOntModel");
String objectUri = (String) request.getAttribute("objectUri"); String objectUri = (String) request.getAttribute("objectUri");
if (objectUri != null) { if (objectUri != null) {
@ -339,8 +436,8 @@ PREFIX core: <${vivoCore}>
</div> </div>
<h4>Years of Participation in Grant</h4> <h4>Years of Participation in Grant</h4>
<v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="7"/> <v:input id="startField" label="Start Year ${yearHint}" />
<v:input type="text" label="End Year ${yearHint}" id="endYear" size="7"/> <v:input id="endField" label="End Year ${yearHint}" />
<p class="submit"><v:input type="submit" id="submit" value="${submitButtonLabel}" cancel="true" /></p> <p class="submit"><v:input type="submit" id="submit" value="${submitButtonLabel}" cancel="true" /></p>