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

NIHVIVO-193. Implemented position type dropdown for person has position history form.

Browse source
This commit is contained in:
rjy7 2010-03-29 17:14:24 +00:00
parent 3f09ddf7d2
commit e60a89f1cb
3 changed files with 29 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
productMods/edit/forms/css/customForm.css
View file

@ -48,4 +48,8 @@ select,
/* This div starts off hidden in case Javascript is disabled. Javascript will show it. */ /* This div starts off hidden in case Javascript is disabled. Javascript will show it. */
.addNewLink { .addNewLink {
display: none; display: none;
}
option {
padding: 0 2px;
} }

38
productMods/edit/forms/personHasPositionHistory.jsp
View file

@ -41,17 +41,19 @@
request.setAttribute("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString())); request.setAttribute("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString()));
%> %>
<c:set var="vivo" value="http://vivoweb.org/ontology/core#" /> <c:set var="vivoCore" value="http://vivoweb.org/ontology/core#" />
<c:set var="rdf" value="<%= VitroVocabulary.RDF %>" /> <c:set var="rdf" value="<%= VitroVocabulary.RDF %>" />
<c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" /> <c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
<c:set var="label" value="${rdfs}label" /> <c:set var="label" value="${rdfs}label" />
<c:set var="type" value="${rdf}type" /> <c:set var="type" value="${rdf}type" />
<c:set var="positionClass" value="${vivoCore}Position" />
<c:set var="orgClass" value="http://xmlns.com/foaf/0.1/Organization" />
<%-- Then enter a SPARQL query for each field, by convention concatenating the field id with "Existing" <%-- Then enter a SPARQL query for each field, by convention concatenating the field id with "Existing"
to convey that the expression is used to retrieve any existing value for the field in an existing individual. to convey that the expression is used to retrieve any existing value for the field in an existing individual.
Each of these must then be referenced in the sparqlForExistingLiterals section of the JSON block below Each of these must then be referenced in the sparqlForExistingLiterals section of the JSON block below
and in the literalsOnForm --%> and in the literalsOnForm --%>
<c:set var="titlePred" value="${vivo}titleOrRole" /> <c:set var="titlePred" value="${vivoCore}titleOrRole" />
<v:jsonset var="titleExisting" > <v:jsonset var="titleExisting" >
SELECT ?titleExisting WHERE { SELECT ?titleExisting WHERE {
?positionUri <${titlePred}> ?titleExisting } ?positionUri <${titlePred}> ?titleExisting }
@ -65,7 +67,7 @@
?positionUri <${label}> ?title. ?positionUri <${label}> ?title.
</v:jsonset> </v:jsonset>
<c:set var="startYearPred" value="${vivo}startYear" /> <c:set var="startYearPred" value="${vivoCore}startYear" />
<v:jsonset var="startYearExisting" > <v:jsonset var="startYearExisting" >
SELECT ?startYearExisting WHERE { SELECT ?startYearExisting WHERE {
?positionUri <${startYearPred}> ?startYearExisting } ?positionUri <${startYearPred}> ?startYearExisting }
@ -74,7 +76,7 @@
?positionUri <${startYearPred}> ?startYear . ?positionUri <${startYearPred}> ?startYear .
</v:jsonset> </v:jsonset>
<c:set var="endYearPred" value="${vivo}endYear" /> <c:set var="endYearPred" value="${vivoCore}endYear" />
<v:jsonset var="endYearExisting" > <v:jsonset var="endYearExisting" >
SELECT ?endYearExisting WHERE { SELECT ?endYearExisting WHERE {
?positionUri <${endYearPred}> ?endYearExisting } ?positionUri <${endYearPred}> ?endYearExisting }
@ -86,8 +88,8 @@
<%-- Note there is really no difference in how things are set up for an object property except <%-- Note there is really no difference in how things are set up for an object property except
below in the n3ForEdit section, in whether the ..Existing variable goes in SparqlForExistingLiterals below in the n3ForEdit section, in whether the ..Existing variable goes in SparqlForExistingLiterals
or in the SparqlForExistingUris, as well as perhaps in how the options are prepared --%> or in the SparqlForExistingUris, as well as perhaps in how the options are prepared --%>
<c:set var="positionInOrgPred" value="${vivo}positionInOrganization" /> <c:set var="positionInOrgPred" value="${vivoCore}positionInOrganization" />
<c:set var="orgForPositionPred" value="${vivo}organizationForPosition" /> <c:set var="orgForPositionPred" value="${vivoCore}organizationForPosition" />
<v:jsonset var="organizationUriExisting" > <v:jsonset var="organizationUriExisting" >
SELECT ?existingOrgUri WHERE { SELECT ?existingOrgUri WHERE {
?positionUri <${positionInOrgPred}> ?existingOrgUri } ?positionUri <${positionInOrgPred}> ?existingOrgUri }
@ -106,11 +108,11 @@
</v:jsonset> </v:jsonset>
<v:jsonset var="n3ForStmtToPerson"> <v:jsonset var="n3ForStmtToPerson">
@prefix core: <${vivo}> . @prefix core: <${vivoCore}> .
?person core:personInPosition ?positionUri . ?person core:personInPosition ?positionUri .
?positionUri core:positionForPerson ?person . ?positionUri core:positionForPerson ?person .
?positionUri <${type}> core:Position . ?positionUri <${type}> ?positionType .
?positionUri <${type}> <${flagURI}> . ?positionUri <${type}> <${flagURI}> .
</v:jsonset> </v:jsonset>
@ -124,9 +126,8 @@
?newOrg <${orgForPositionPred}> ?positionUri . ?newOrg <${orgForPositionPred}> ?positionUri .
</v:jsonset> </v:jsonset>
<v:jsonset var="postionClass">http://vivoweb.org/ontology/core#Position</v:jsonset> <v:jsonset var="positionClassUriJson">${positionClass}</v:jsonset>
<v:jsonset var="organizationClass">http://xmlns.com/foaf/0.1/Organization</v:jsonset> <v:jsonset var="orgClassUriJson">${orgClass}</v:jsonset>
<c:set var="editjson" scope="request"> <c:set var="editjson" scope="request">
{ {
@ -176,13 +177,24 @@
"rangeLang" : "", "rangeLang" : "",
"assertions" : [ "${titleAssertion}" ] "assertions" : [ "${titleAssertion}" ]
}, },
"positionType" : {
"newResource" : "false",
"validators" : [ ],
"optionsType" : "CHILD_VCLASSES_WITH_PARENT",
"literalOptions" : [ "Select one" ],
"predicateUri" : "",
"objectClassUri" : "${positionClassUriJson}",
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ ]
},
"organizationUri" : { "organizationUri" : {
"newResource" : "false", "newResource" : "false",
"validators" : [ ], "validators" : [ ],
"optionsType" : "INDIVIDUALS_VIA_VCLASS", "optionsType" : "INDIVIDUALS_VIA_VCLASS",
"literalOptions" : [ "Select one" ], "literalOptions" : [ "Select one" ],
"predicateUri" : "", "predicateUri" : "",
"objectClassUri" : "${organizationClass}", "objectClassUri" : "${orgClassUriJson}",
"rangeDatatypeUri" : "", "rangeDatatypeUri" : "",
"rangeLang" : "", "rangeLang" : "",
"assertions" : [ "${organizationUriAssertion}" ] "assertions" : [ "${organizationUriAssertion}" ]
@ -305,7 +317,7 @@
<div id="entry"> <div id="entry">
<v:input type="text" label="Position Title" id="title" size="30" /> <v:input type="text" label="Position Title" id="title" size="30" />
<v:input type="select" label="Position Type" id="type" /> <v:input type="select" label="Position Type" id="positionType" />
<p class="inline"><v:input type="text" label="Start Year" id="startYear" size="4" /></p> <p class="inline"><v:input type="text" label="Start Year" id="startYear" size="4" /></p>
<p class="inline"><v:input type="text" label="End Year" id="endYear" size="4" /></p> <p class="inline"><v:input type="text" label="End Year" id="endYear" size="4" /></p>

276
productMods/edit/forms/personHasPositionHistory.old.jsp
View file

@ -1,276 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="com.hp.hpl.jena.rdf.model.Literal"%>
<%@ page import="com.hp.hpl.jena.rdf.model.Model"%>
<%@ page import="com.hp.hpl.jena.vocabulary.XSD" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%>
<%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%>
<%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %>
<%!
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.personHasPositionHistory.jsp");
%>
<%
VitroRequest vreq = new VitroRequest(request);
WebappDaoFactory wdf = vreq.getWebappDaoFactory();
vreq.setAttribute("defaultNamespace", wdf.getDefaultNamespace());
String flagURI = null;
if (vreq.getAppBean().isFlag1Active()) {
flagURI = VitroVocabulary.vitroURI+"Flag1Value"+vreq.getPortal().getPortalId()+"Thing";
} else {
flagURI = wdf.getVClassDao().getTopConcept().getURI(); // fall back to owl:Thing if not portal filtering
}
vreq.setAttribute("flagURI",flagURI);
request.setAttribute("stringDatatypeUriJson", MiscWebUtils.escape(XSD.xstring.toString()));
request.setAttribute("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString()));
%>
<c:set var="vivo" value="http://vivoweb.org/ontology/core#" />
<c:set var="rdf" value="<%= VitroVocabulary.RDF %>" />
<c:set var="rdfs" value="<% VitroVocabulary.RDFS %>" />
<%-- Then enter a SPARQL query for each field, by convention concatenating the field id with "Existing"
to convey that the expression is used to retrieve any existing value for the field in an existing individual.
Each of these must then be referenced in the sparqlForExistingLiterals section of the JSON block below
and in the literalsOnForm --%>
<c:set var="titlePred" value="${vivo}titleOrRole" />
<v:jsonset var="titleExisting" >
SELECT ?titleExisting WHERE {
?positionUri <${titlePred}> ?titleExisting }
</v:jsonset>
<%-- Pair the "existing" query with the skeleton of what will be asserted for a new statement involving this field.
The actual assertion inserted in the model will be created via string substitution into the ? variables.
NOTE the pattern of punctuation (a period after the prefix URI and after the ?field) --%>
<v:jsonset var="titleAssertion" >
?positionUri <${titlePred}> ?title .
?positionUri <${rdf}label> ?title.
</v:jsonset>
<c:set var="involvedOrgNamePred" value="${vivo}involvedOrganizationName" />
<v:jsonset var="organizationNameExisting" >
SELECT ?existingOrgName WHERE {
?positionUri <${involvedOrgNamePred}> ?existingOrgName }
</v:jsonset>
<v:jsonset var="organizationNameAssertion" >
?positionUri <${involvedOrgNamePred}> ?organizationName .
</v:jsonset>
<c:set var="startYearPred" value="${vivo}startYear" />
<v:jsonset var="startYearExisting" >
SELECT ?startYearExisting WHERE {
?positionUri <${startYearPred}> ?startYearExisting }
</v:jsonset>
<v:jsonset var="startYearAssertion" >
?positionUri <${startYearPred}> ?startYear .
</v:jsonset>
<c:set var="endYearPred" value="${vivo}endYear" />
<v:jsonset var="endYearExisting" >
SELECT ?endYearExisting WHERE {
?positionUri <${endYearPred}> ?endYearExisting }
</v:jsonset>
<v:jsonset var="endYearAssertion" >
?positionUri <${endYearPred}> ?endYear .
</v:jsonset>
<%-- Note there is really no difference in how things are set up for an object property except
below in the n3ForEdit section, in whether the ..Existing variable goes in SparqlForExistingLiterals
or in the SparqlForExistingUris, as well as perhaps in how the options are prepared --%>
<c:set var="positionInOrgPred" value="${vivo}positionInOrganization" />
<v:jsonset var="organizationUriExisting" >
SELECT ?existingOrgUri WHERE {
?positionUri <${positionInOrgPred}> ?existingOrgUri }
</v:jsonset>
<v:jsonset var="organizationUriAssertion" >
?positionUri <${positionInOrgPred}> ?organizationUri .
?organizationUri <${vivo}organizationForPosition> ?positionUri .
</v:jsonset>
<v:jsonset var="n3ForStmtToPerson" >
@prefix rdf: <${rdf}>.
@prefix core: <${vivo}>.
?person core:personInPosition ?positionUri .
?positionUri core:positionForPerson ?person .
?positionUri rdf:type core:Position .
?positionUri rdf:type <${flagURI}> .
</v:jsonset>
<v:jsonset var="postionClass">http://vivoweb.org/ontology/core#Position</v:jsonset>
<v:jsonset var="organizationClass">http://xmlns.com/foaf/0.1/Organization</v:jsonset>
<c:set var="editjson" scope="request">
{
"formUrl" : "${formUrl}",
"editKey" : "${editKey}",
"urlPatternToReturnTo" : "/entity",
"subject" : ["person", "${subjectUriJson}" ],
"predicate" : ["predicate", "${predicateUriJson}" ],
"object" : ["positionUri", "${objectUriJson}", "URI" ],
"n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}", "${startYearAssertion}" ],
"n3optional" : [ "${organizationNameAssertion}","${organizationUriAssertion}",
"${endYearAssertion}"],
"newResources" : { "positionUri" : "${defaultNamespace}" },
"urisInScope" : { },
"literalsInScope": { },
"urisOnForm" : [ "organizationUri" ],
"literalsOnForm" : [ "title", "organizationName",
"startYear", "endYear" ],
"filesOnForm" : [ ],
"sparqlForLiterals" : { },
"sparqlForUris" : { },
"sparqlForExistingLiterals" : {
"title" : "${titleExisting}",
"organizationName" : "${organizationNameExisting}",
"startYear" : "${startYearExisting}",
"endYear" : "${endYearExisting}"
},
"sparqlForExistingUris" : {
"organizationUri" : "${organizationUriExisting}"
},
"fields" : {
"title" : {
"newResource" : "false",
"validators" : [ "nonempty" ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
"objectClassUri" : "",
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ "${titleAssertion}" ]
},
"organizationUri" : {
"newResource" : "false",
"validators" : [ ],
"optionsType" : "INDIVIDUALS_VIA_VCLASS",
"literalOptions" : [ "Select one" ],
"predicateUri" : "",
"objectClassUri" : "${organizationClass}",
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ "${organizationUriAssertion}" ]
},
"organizationName" : {
"newResource" : "false",
"validators" : [ ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
"objectClassUri" : "",
"rangeDatatypeUri" : "${stringDatatypeUriJson}",
"rangeLang" : "",
"assertions" : [ "${organizationNameAssertion}" ]
},
"startYear" : {
"newResource" : "false",
"validators" : [ "nonempty", "datatype:${gYearDatatypeUriJson}" ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
"objectClassUri" : "",
"rangeDatatypeUri" : "${gYearDatatypeUriJson}",
"rangeLang" : "",
"assertions" : ["${startYearAssertion}"]
},
"endYear" : {
"newResource" : "false",
"validators" : [ "datatype:${gYearDatatypeUriJson}" ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
"objectClassUri" : "",
"rangeDatatypeUri" : "${gYearDatatypeUriJson}",
"rangeLang" : "",
"assertions" : ["${endYearAssertion}"]
}
}
}
</c:set>
<%
log.debug(request.getAttribute("editjson"));
EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request);
if (editConfig == null) {
editConfig = new EditConfiguration(
(String) request
.getAttribute("editjson"));
EditConfiguration.putConfigInSession(editConfig,session);
}
Model model = (Model) application.getAttribute("jenaOntModel");
String objectUri = (String) request.getAttribute("objectUri");
if (objectUri != null) {
editConfig.prepareForObjPropUpdate(model);
} else {
editConfig.prepareForNonUpdate(model);
}
/* prepare the page title and text for the submit button */
String subjectName = ((Individual) request.getAttribute("subject")).getName();
String submitLabel = "";
if (objectUri != null) {
request.setAttribute("title","Edit position entry for "+ subjectName);
submitLabel = "Save changes";
} else {
request.setAttribute("title","Create a new position entry for " + subjectName);
submitLabel = "Create new position history entry";
}
List<String> customJs = new ArrayList<String>(Arrays.asList("forms/js/personHasPositionHistory.js"));
request.setAttribute("customJs", customJs);
List<String> customCss = new ArrayList<String>(Arrays.asList("forms/css/personHasPositionHistory.css"));
request.setAttribute("customCss", customCss);
%>
<jsp:include page="${preForm}" />
<h2>${title}</h2>
<form action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<div id="orgNotListed">
If your organization is not listed, please <a href="#">add a new organization</a>.
</div>
<div id="existingOrg">
<v:input type="select" label="Organization" id="organizationUri" />
</div>
<div id="newOrg">
</div>
<div id="position">
<v:input type="text" label="Position Title" id="title" size="30" />
<v:input type="select" label="Position Type" id="type" />
<v:input type="text" label="Start Year" id="startYear" size="4"/>
<v:input type="text" label="End Year" id="endYear" size="4"/>
</div>
<p class="submit"><v:input type="submit" id="submit" value="<%=submitLabel%>" cancel="${param.subjectUri}"/></p>
</form>
<jsp:include page="${postForm}"/>