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

NIHVIVO-1820 Updated precision to full (Second) and requiredLevel to none for dateTimeInterval dateTimeValue custom forms. NIHVIVO-1855, NIHVIVO-1829 Corrected submit button text for dateTimeIntervalForm.jsp

Browse source
This commit is contained in:
nac26 2011-01-21 20:18:05 +00:00
parent 893ac85b38
commit 1f2edcc622
3 changed files with 66 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
webapp/web/edit/forms/dateTimeIntervalForm.jsp
View file

@ -138,14 +138,14 @@
%> %>
<c:set var="editMode" value="edit" /> <c:set var="editMode" value="edit" />
<c:set var="titleVerb" value="Edit" /> <c:set var="titleVerb" value="Edit" />
<c:set var="submitButtonText" value="Edit Position" /> <c:set var="submitButtonText" value="Edit Date/Time Interval" />
<c:set var="disabledVal" value="disabled" /> <c:set var="disabledVal" value="disabled" />
<% <%
} else { // adding new entry } else { // adding new entry
%> %>
<c:set var="editMode" value="add" /> <c:set var="editMode" value="add" />
<c:set var="titleVerb" value="Create" /> <c:set var="titleVerb" value="Create" />
<c:set var="submitButtonText" value="Position" /> <c:set var="submitButtonText" value="Create Date/Time Interval" />
<c:set var="disabledVal" value="" /> <c:set var="disabledVal" value="" />
<% } %> <% } %>
@ -223,9 +223,9 @@
//setup date time edit elements //setup date time edit elements
Field startField = editConfig.getField("startField"); Field startField = editConfig.getField("startField");
// arguments for DateTimeWithPrecision are (fieldName, minimumPrecision, [requiredLevel]) // arguments for DateTimeWithPrecision are (fieldName, minimumPrecision, [requiredLevel])
startField.setEditElement(new DateTimeWithPrecision(startField, VitroVocabulary.Precision.DAY.uri(), VitroVocabulary.Precision.DAY.uri())); startField.setEditElement(new DateTimeWithPrecision(startField, VitroVocabulary.Precision.SECOND.uri(), VitroVocabulary.Precision.NONE.uri()));
Field endField = editConfig.getField("endField"); Field endField = editConfig.getField("endField");
endField.setEditElement(new DateTimeWithPrecision(endField, VitroVocabulary.Precision.DAY.uri(), VitroVocabulary.Precision.DAY.uri())); endField.setEditElement(new DateTimeWithPrecision(endField, VitroVocabulary.Precision.SECOND.uri(), VitroVocabulary.Precision.NONE.uri()));
} }
editConfig.addValidator(new DateTimeIntervalValidation("startField","endField") ); editConfig.addValidator(new DateTimeIntervalValidation("startField","endField") );
@ -238,6 +238,18 @@
editConfig.prepareForNonUpdate(model); editConfig.prepareForNonUpdate(model);
} }
List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(),
JavaScript.CUSTOM_FORM_UTILS.path(),
"/edit/forms/js/customFormWithAutocomplete.js"
));
request.setAttribute("customJs", customJs);
List<String> customCss = new ArrayList<String>(Arrays.asList(Css.JQUERY_UI.path(),
Css.CUSTOM_FORM.path(),
"/edit/forms/css/customFormWithAutocomplete.css"
));
request.setAttribute("customCss", customCss);
String subjectName = ((Individual) request.getAttribute("subject")).getName(); String subjectName = ((Individual) request.getAttribute("subject")).getName();
%> %>

30
webapp/web/edit/forms/dateTimeValueForm.jsp
View file

@ -56,14 +56,12 @@
</v:jsonset> </v:jsonset>
<%-- Queries for editing an existing role --%> <%-- Queries for editing an existing role --%>
<v:jsonset var="existingNodeQuery" >
<v:jsonset var="existingNodeQuery" >
SELECT ?existingNode WHERE { SELECT ?existingNode WHERE {
?subject <${toDateTimeValue}> ?existingNode . ?subject <${toDateTimeValue}> ?existingNode .
?existingNode <${type}> <${valueType}> . } ?existingNode <${type}> <${valueType}> . }
</v:jsonset> </v:jsonset>
existingDateTimeValueQuery
<v:jsonset var="existingDateTimeValueQuery" > <v:jsonset var="existingDateTimeValueQuery" >
SELECT ?existingDateTimeValue WHERE { SELECT ?existingDateTimeValue WHERE {
?subject <${toDateTimeValue}> ?existingValueNode . ?subject <${toDateTimeValue}> ?existingValueNode .
@ -87,14 +85,14 @@
%> %>
<c:set var="editMode" value="edit" /> <c:set var="editMode" value="edit" />
<c:set var="titleVerb" value="Edit" /> <c:set var="titleVerb" value="Edit" />
<c:set var="submitButtonText" value="Edit DateTime Value" /> <c:set var="submitButtonText" value="Edit Date/Time Value" />
<c:set var="disabledVal" value="disabled" /> <c:set var="disabledVal" value="disabled" />
<% <%
} else { // adding new entry } else { // adding new entry
%> %>
<c:set var="editMode" value="add" /> <c:set var="editMode" value="add" />
<c:set var="titleVerb" value="Create" /> <c:set var="titleVerb" value="Create" />
<c:set var="submitButtonText" value="DateTime Value" /> <c:set var="submitButtonText" value="Create Date/Time Value" />
<c:set var="disabledVal" value="" /> <c:set var="disabledVal" value="" />
<% } %> <% } %>
@ -108,9 +106,9 @@
"predicate" : ["toDateTimeValue", "${predicateUriJson}" ], "predicate" : ["toDateTimeValue", "${predicateUriJson}" ],
"object" : ["valueNode", "${objectUriJson}", "URI" ], "object" : ["valueNode", "${objectUriJson}", "URI" ],
"n3required" : [ "${n3ForValue}" ], "n3required" : [ ],
"n3optional" : [ ], "n3optional" : [ "${n3ForValue}" ],
"newResources" : { "valueNode" : "${defaultNamespace}" }, "newResources" : { "valueNode" : "${defaultNamespace}" },
@ -155,7 +153,7 @@
//setup date time edit elements //setup date time edit elements
Field dateTimeField = editConfig.getField("dateTimeField"); Field dateTimeField = editConfig.getField("dateTimeField");
// arguments for DateTimeWithPrecision are (fieldName, minimumPrecision, [requiredLevel]) // arguments for DateTimeWithPrecision are (fieldName, minimumPrecision, [requiredLevel])
dateTimeField.setEditElement(new DateTimeWithPrecision(dateTimeField, VitroVocabulary.Precision.DAY.uri(), VitroVocabulary.Precision.DAY.uri())); dateTimeField.setEditElement(new DateTimeWithPrecision(dateTimeField, VitroVocabulary.Precision.SECOND.uri(), VitroVocabulary.Precision.NONE.uri()));
} }
Model model = (Model) application.getAttribute("jenaOntModel"); Model model = (Model) application.getAttribute("jenaOntModel");
@ -166,16 +164,28 @@
editConfig.prepareForNonUpdate(model); editConfig.prepareForNonUpdate(model);
} }
List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(),
JavaScript.CUSTOM_FORM_UTILS.path(),
"/edit/forms/js/customFormWithAutocomplete.js"
));
request.setAttribute("customJs", customJs);
List<String> customCss = new ArrayList<String>(Arrays.asList(Css.JQUERY_UI.path(),
Css.CUSTOM_FORM.path(),
"/edit/forms/css/customFormWithAutocomplete.css"
));
request.setAttribute("customCss", customCss);
String subjectName = ((Individual) request.getAttribute("subject")).getName(); String subjectName = ((Individual) request.getAttribute("subject")).getName();
%> %>
<jsp:include page="${preForm}" /> <jsp:include page="${preForm}" />
<h2>${titleVerb}&nbsp;date time value for <%= subjectName %></h2> <h2>${titleVerb} date time value for <%= subjectName %></h2>
<form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" > <form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<v:input id="dateTimeField" label="date time" /> <v:input id="dateTimeField" />
<p class="submit"><v:input type="submit" id="submit" value="${submitButtonText}" cancel="true"/></p> <p class="submit"><v:input type="submit" id="submit" value="${submitButtonText}" cancel="true"/></p>
</form> </form>

2
webapp/web/templates/freemarker/edit/dateTimeWithPrecision.ftl
View file

@ -68,7 +68,7 @@ precisionConstants.second -- URI for precision
<#assign reqLevel = 0 /> <#assign reqLevel = 0 />
</#if> </#if>
<fieldset id="dateTime"> <fieldset class="dateTime">
<#if precLevel gte 1> <#if precLevel gte 1>
<#-- Only text input field in the mix. We should have some validation to ensure it's a valid year (4 digits, integer, etc) --> <#-- Only text input field in the mix. We should have some validation to ensure it's a valid year (4 digits, integer, etc) -->