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

NIHVIVO-3163 and 3246. Date Time Value form and generator

Browse source
This commit is contained in:
tworrall 2011-11-21 17:11:51 +00:00
parent bcef31315f
commit 7b6f43bace
2 changed files with 17 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
View file

@ -55,10 +55,12 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
"dateTimeField-precision", existingPrecisionQuery);
conf.addSparqlForExistingUris("valueNode", existingNodeQuery);
conf.addField(new FieldVTwo().setName("dateTimeField").
setEditElement(new DateTimeWithPrecisionVTwo(null,
FieldVTwo dateTimeField = new FieldVTwo().setName("dateTimeField");
dateTimeField.setEditElement(new DateTimeWithPrecisionVTwo(dateTimeField,
VitroVocabulary.Precision.SECOND.uri(),
VitroVocabulary.Precision.NONE.uri())));
VitroVocabulary.Precision.NONE.uri()));
conf.addField(dateTimeField);
//Adding additional data, specifically edit mode
addFormSpecificData(conf, vreq);
@ -75,7 +77,7 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
final static String existingDateTimeValueQuery =
"SELECT ?existingDateTimeValue WHERE { \n" +
"?subject <" + toDateTimeValue + "> ?existingValueNode . \n" +
"?existingValueNode a <" + valueType + " . \n" +
"?existingValueNode a <" + valueType + "> . \n" +
"?existingValueNode <" + dateTimeValue + "> ?existingDateTimeValue }";
final static String existingPrecisionQuery =

76
webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl
View file

@ -2,11 +2,9 @@
<#-- Template for adding/editing time values -->
<#if editConfig.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 />
<#if editMode == "edit">
<#assign titleVerb="Edit">
@ -18,76 +16,24 @@
<#assign disabledVal=""/>
</#if>
<h2>${editMode} date time value for ${individualName}</h2>
<h2>${editMode} date time value for ${editConfiguration.subjectName}</h2>
<form class="customForm" action ="${submitUrl}" class="customForm">
<fieldset class="dateTime" role="group">
<label for="dateTimeField-year">Year</label>
<input class="text-field" name="dateTimeField-year" id="dateTimeField-year" type="text" value="" size="4" maxlength="4" role="input"/>
<label for="dateTimeField-month">Month</label>
<select name="dateTimeField-month" id="dateTimeField-month" role="select">
<option value="" role="option" <#if dateTimeField-month="">selected</#if>month</option>
<#list dateTimeField-months as dateTimeField-month>
<option value="dateTimeField-month" <#if dateTimeField-month = dateTimeField-month.uri>selected</#if> >${dateTimeField-month.label}</option>
</#list>
</select>
<label for="dateTimeField-day">Day</label>
<select name="dateTimeField-day" id="dateTimeField-day" role="select">
<option value="" role="option"><#if dateTimeField-day="">selected</#if>day</option>
<#list dateTimeField-day as dateTimeField-day>
<option value="dateTimeField-day" role="option" <#if dateTimeField-day=dateTimeField-day.uri>selected</#if> >${dateTimeField-day.label}</option>
</#list>
</select>
</fieldset>
<fieldset class="dateTime" role="group">
<label for="dateTimeField-hour">Hour</label>
<select name="dateTimeField-hour" id="dateTimeField-hour" role="select">
<option value="" role="option"><#if dateTimeField-hour="">selected</#if>hour</option>
<#list dateTimeField-hours as dateTimeField-hour>
<option value="dateTimeField-hour" role="option" <#if dateTimeField-hour=dateTimeField-hour.uri>selected</#if> >${dateTimeField-hour.label}</option>
</#list>
</select>
<label for="dateTimeField-minute">Minutes</label>
<select name="dateTimeField-hour" id="dateTimeField-hour" role="select">
<option value="" role="option"><#if dateTimeField-minute="">selected</#if>minutes</option>
<#list dateTimeField-minutes as dateTimeField-minute>
<option value="dateTimeField-minute" role="option" <#if dateTimeField-minute=dateTimeField-minute.uri>selected</#if> >${dateTimeField-minute.label}</option>
</#list>
</select>
<label for="dateTimeField-second">Seconds</label>
<select name="dateTimeField-second" id="dateTimeField-second" role="select">
<option value="" role="option"><#if dateTimeField-second="">selected</#if>seconds</option>
<#list dateTimeField-seconds as dateTimeField-second>
<option value="dateTimeField-second" role="option" <#if dateTimeField-second=dateTimeField-second.uri>selected</#if> >${dateTimeField-second.label}</option>
</#list>
</select>
</fieldset>
<#--Need to draw edit elements for dates here-->
<#if htmlForElements?keys?seq_contains("dateTimeField")>
${htmlForElements["dateTimeField"]}
</#if>
<p class="submit">
<input type="hidden" name="editKey" value="${keyValue}" />
<input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button" />
<input type="hidden" name="editKey" value="${editKey}" />
<input type="submit" id="submit" value="${submitButtonText}" role="button" />
<span class="or"> or </span>
<a class="Cancel" href="${editConfiguration.cancelUrl}" title="Cancel">Cancel</a>
<a class="cancel" href="${editConfiguration.cancelUrl}" title="Cancel">Cancel</a>
</p>
</form>
<#assign acUrl="/autocomplete?tokenize=true&stem=true" >
<script type="text/javascript">
var customFormData = {
acUrl: '${acUrl?url}',
editMode: '${editMode}',
submitButtonTextType: 'compound',
defaultTypeName: 'organization'
};
</script>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />',
'<link rel="stylesheet" href="${urls.base}/edit/forms/css/personHasEducationalTraining.css" />')}