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

NIHVIVO-3186 updated the generator to use mostSpecificType for the posn type, which was not working correctly in edit mode. Updated the template so that autocomplete only pulls in foaf persons. Updated button text

Browse source
This commit is contained in:
tworrall 2011-11-28 16:50:18 +00:00
parent aff77519a4
commit 4882021d9e
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
View file

@ -16,7 +16,7 @@
<#assign disabledVal="disabled">
<#else>
<#assign titleVerb="Create">
<#assign submitButtonText="Create Position">
<#assign submitButtonText="Position">
<#assign disabledVal=""/>
</#if>
@ -39,13 +39,13 @@
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
<p>
<#if lvf.submissionErrorExists(editSubmission, "positionTitle")>
Please enter a value in the Position Title field.
Please enter a value in the Position Title field.<br />
</#if>
<#if lvf.submissionErrorExists(editSubmission, "positionType")>
Please select a value in the Position Type field.
Please select a value in the Position Type field.<br />
</#if>
<#if lvf.submissionErrorExists(editSubmission, "personLabel")>
Please enter a value in the Person field.
Please select an existing value or enter a new value in the Person field.
</#if>
<#list submissionErrors?keys as errorFieldName>
@ -55,14 +55,14 @@
<#else>
${submissionErrors[errorFieldName]}
</#if>
<br />
<#elseif errorFieldName == "endField">
<#if submissionErrors[errorFieldName]?contains("after")>
The End Year must be later than the Start Year.
<#else>
${submissionErrors[errorFieldName]}
</#if>
</#if>
</#if><br />
</#list>
</p>
</section>
@ -92,9 +92,9 @@
</#list>
</#if>
</select>
<select id="typeSelector" style="display:none"><option value="http://xmlns.com/foaf/0.1/Person" selected="selected">Person</option></select>
<p>
<label for="relatedIndLabel">Person</label>
<label for="relatedIndLabel">Person ${requiredHint}</label>
<#if editMode == "edit">
<input class="acSelector" size="50" type="text" id="relatedIndLabel" name="personLabel" value="${personLabelValue}" disabled="disabled" >
<input class="acLabelReceiver" type="hidden" id="existingPersonLabel" name="personLabel" value="${personLabelValue}" />

2
productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
View file

@ -26,7 +26,7 @@
<#assign disabledVal="disabled">
<#else>
<#assign formAction="Create">
<#assign submitButtonText="Create Position">
<#assign submitButtonText="Position">
<#assign disabledVal="">
</#if>

4
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
View file

@ -8,6 +8,7 @@ import javax.servlet.http.HttpSession;
import com.hp.hpl.jena.vocabulary.XSD;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.Precision;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
@ -30,8 +31,9 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
+ " ?position rdfs:label ?existingPositionTitle . }";
private static final String QUERY_EXISTING_POSITION_TYPE = ""
+ "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n"
+ "SELECT ?existingPositionType WHERE { \n"
+ " ?position a ?existingPositionType . }";
+ " ?position vitro:mostSpecificType ?existingPositionType . }";
private static final String QUERY_EXISTING_PERSON = ""
+ "PREFIX core: <http://vivoweb.org/ontology/core#> \n"