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

Updates to person has educational training form

Browse source
This commit is contained in:
hjkhjk54 2011-11-16 19:47:53 +00:00
parent ae2b8f3670
commit 8ac7dfc813
3 changed files with 63 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
View file

@ -1,4 +1,5 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "lib-vivo-form.ftl" as lvf>
<#-- Template for adding a grant role, such as principal investigator, to a foaf:Persons -->
<#--Retrieve certain edit configuration information-->
@ -40,14 +41,10 @@
<#--Get selected activity type value if it exists, this is alternative to below-->
<#assign grantLabel = lvf.getFormFieldValue(editSubmission, editConfiguration, "grantLabel")/>
<#--Get existing grant label value-->
<#assign existingGrantLabel = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingGrantLabel")/>
<#--Get existing grant label value-->
<#assign existingGrantLabel = "" />
<#if literalValues?keys?seq_contains("existingGrantLabel") && (literalValues.existingGrantLabel?size > 0)>
<#assign existingGrantLabel = literalValues.existingGrantLabel[0] />
</#if>
<#assign requiredHint = "<span class='requiredHint'> *</span>" />
<#assign yearHint = "<span class='hint'>(YYYY)</span>" />

62
productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
View file

@ -10,11 +10,17 @@
<#assign roleActivityUri="mysteryRoleActivityURI"/>
<#assign orgLabel="mysteryOrgLabel"/>
<#if editConfiguration.object?has_content>
<#assign editMode = "edit">
<#else>
<#assign editMode = "add">
</#if>
<#--Retrieve certain edit configuration information-->
<#assign editMode = editConfiguration.pageData.editMode />
<#assign htmlForElements = editConfiguration.pageData.htmlForElements />
<#--Retrieve variables needed-->
<#assign orgTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "orgType")/>
<#assign orgLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "orgLabel") />
<#assign deptValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "dept") />
<#assign infoValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "info") />
<#assign majorFieldValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "majorField") />
<#assign degreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "degree") />
<#if editMode == "edit">
<#assign titleVerb="Edit">
@ -67,7 +73,7 @@
<select id="typeSelector" name="orgType" >
<option value="" selected="selected">Select one</option>
<#list orgTypeOpts?keys as key>
<#if editConfiguration.objectUri?has_content && editConfiguration.objectUri = key>
<#if orgTypeValue = key>
<option value="${key}" selected >${orgTypeOpts[key]}</option>
<#else>
<option value="${key}">${orgTypeOpts[key]}</option>
@ -78,23 +84,29 @@
<p>
<label for="relatedIndLabel">### Name ${requiredHint}</label>
<input class="acSelector" size="50" type="text" id="relatedIndLabel" name="orgLabel" value="" />
<input class="acSelector" size="50" type="text" id="relatedIndLabel" name="orgLabel" value="${orgLabelValue}" />
</p>
<#--Store values in hidden fields-->
<#if editMode="edit">
<input type="hidden" name="orgType" id="orgType" value="${orgTypeValue}"/>
<input type="hidden" name="orgLabel" id="orgLabel" value="${orgLabelValue}"/>
</#if>
<div class="acSelection">
<p class="inline">
<label>Selected Organization:</label>
<span class="acSelectionInfo"></span>
<a href="/vivo/individual?uri=" class="verifyMatch">(Verify this match)</a>
</p>
<input class="acUriReceiver" type="hidden" id="${roleActivityUri}" name="org" value="" />
<input class="acUriReceiver" type="hidden" id="org" name="org" value="" /> <!--Field populated by javascript-->
<input class="acLabelReceiver" type="hidden" id="existingOrgLabel" name="existingOrgLabel" value="${orgLabel}" />
<input class="acLabelReceiver" type="hidden" id="existingOrgLabel" name="existingOrgLabel" value="" />
</div>
<p>
<label for="dept">Department or School Name within the ###</label>
<input size="50" type="text" id="dept" name="dept" value="" />
<input size="50" type="text" id="dept" name="dept" value="${deptValue}" />
</p>
<div class="entry">
@ -102,39 +114,41 @@
<#assign degreeOpts = editConfiguration.pageData.degree />
<select name="degree" id="degreeUri" >
<option value="" selected="selected">Select one</option>
<option value="" <#if degreeValue = "">selected</#if>>Select one</option>
<#list degreeOpts?keys as key>
<option value="${key}">${degreeOpts[key]}</option>
<option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>
</#list>
</select>
</div>
<p>
<label for="majorField">Major Field of Degree</label>
<input type="text" id="majorField" name="majorField" size="30" value=""/>
<input type="text" id="majorField" name="majorField" size="30" value="${majorFieldValue}"/>
</p>
<p>
<label for="info">Supplemental Information</label>
<input size="50" type="text" id="info" name="info" value="" />
<input size="50" type="text" id="info" name="info" value="${infoValue}" />
<br />e.g., <em>Postdoctoral training</em> or <em>Transferred</em>
</p>
<label for="startField">Start Year ${yearHint}</label>
<fieldset class="dateTime">
<input class="text-field" name="startField-year" id="startField-year" type="text" value="" size="4" maxlength="4" />
</fieldset>
<#--Need to draw edit elements for dates here-->
<#if htmlForElements?keys?seq_contains("startField")>
<label for="startField">Start Year ${yearHint}</label>
${htmlForElements["startField"]}
</#if>
<#if htmlForElements?keys?seq_contains("endField")>
<label for="endField">Start Year ${yearHint}</label>
${htmlForElements["startField"]}
</#if>
<label for="endField">End Year ${yearHint}</label>
<fieldset class="dateTime">
<input class="text-field" name="endField-year" id="endField-year" type="text" value="" size="4" maxlength="4" />
</fieldset>
<#--End draw elements-->
<input type="hidden" id="editKey" name="editKey" value="${editConfiguration.editKey}"/>
<input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
<p class="submit">
<input type="submit" id="submit" value="${submitButtonText}"/><span class="or"> or </span>
<a class="cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
<a class="cancel" href="${cancelUrl}">Cancel</a>
</p>
<p id="requiredLegend" class="requiredHint">* required fields</p>

20
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
View file

@ -1,7 +1,10 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import javax.servlet.http.HttpSession;
@ -14,6 +17,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalVali
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
import edu.cornell.mannlib.vitro.webapp.utils.generators.AddRoleUtils;
/**
Form for adding an educational attainment to an individual
@ -168,6 +173,8 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
VitroVocabulary.Precision.NONE.uri())));
//Add validator
conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
//Adding additional data, specifically edit mode
addFormSpecificData(conf, vreq);
return conf;
}
@ -309,4 +316,17 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
"?endNode <"+ type +"> <"+ dateTimeValueType +"> .\n"+
"?endNode <"+ dateTimePrecision +"> ?existingEndPrecision . }";
//Adding form specific data such as edit mode
public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
formSpecificData.put("editMode", getEditMode(vreq).name().toLowerCase());
editConfiguration.setFormSpecificData(formSpecificData);
}
public EditMode getEditMode(VitroRequest vreq) {
List<String> predicates = new ArrayList<String>();
predicates.add(trainingAtOrg);
return AddRoleUtils.getEditMode(vreq, predicates);
}
}