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

Working on converting organizationHasPositionHistory to date time with precision NIHVIVO-631

Browse source
This commit is contained in:
bdc34 2011-01-05 21:25:18 +00:00
parent d788f6843c
commit 8843c034d7
2 changed files with 137 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,8 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.StartYearBeforeEndYear"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.JavaScript" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%>
<%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %>
@ -37,8 +39,9 @@
%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%><c:set var="vivoCore" value="http://vivoweb.org/ontology/core#" />
<c:set var="vivoCore" value="http://vivoweb.org/ontology/core#" />
<c:set var="type" value="<%= VitroVocabulary.RDF_TYPE %>" />
<c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
<c:set var="label" value="${rdfs}label" />
@ -79,14 +82,6 @@
?position a ?positionType .
</v:jsonset>
<v:jsonset var="startYearAssertion" >
?position <${startYearPred}> ?startYear .
</v:jsonset>
<v:jsonset var="endYearAssertion" >
?position <${endYearPred}> ?endYear .
</v:jsonset>
<v:jsonset var="n3ForNewPosition">
@prefix core: <${vivoCore}> .
@ -374,9 +369,9 @@
//setup date time edit elements
Field startField = editConfig.getField("startField");
startField.setEditElement(new DateTimeWithPrecision(startField, VitroVocabulary.Precision.YEAR));
startField.setEditElement(new DateTimeWithPrecision(startField, VitroVocabulary.Precision.YEAR.uri(),VitroVocabulary.Precision.YEAR.uri()));
Field endField = editConfig.getField("endField");
endField.setEditElement(new DateTimeWithPrecision(endField, VitroVocabulary.Precision.YEAR));
endField.setEditElement(new DateTimeWithPrecision(endField, VitroVocabulary.Precision.YEAR.uri(),VitroVocabulary.Precision.YEAR.uri()));
}
editConfig.addValidator(new StartYearBeforeEndYear("startYear","endYear") );