Skip to content
Snippets Groups Projects
Commit 4fb3d9f6 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

feat: Change dataType to date for timeOfObservation

parent 9075802a
Branches
No related tags found
No related merge requests found
...@@ -411,7 +411,7 @@ public class ObservationController extends HttpServlet { ...@@ -411,7 +411,7 @@ public class ObservationController extends HttpServlet {
formValidation.getFormField("cropOrganismId").getValueAsInteger())); formValidation.getFormField("cropOrganismId").getValueAsInteger()));
} }
observation.setTimeOfObservation( observation.setTimeOfObservation(
formValidation.getFormField("timeOfObservation").getValueAsTimestamp()); formValidation.getFormField("timeOfObservation").getValueAsDate());
if (observationId <= 0) { if (observationId <= 0) {
observation.setUserId(user.getUserId()); observation.setUserId(user.getUserId());
} else { } else {
......
...@@ -40,9 +40,7 @@ ...@@ -40,9 +40,7 @@
}, },
{ {
"name" : "timeOfObservation", "name" : "timeOfObservation",
"dataType" : "TIMESTAMP", "dataType" : "DATE",
"timestampFormat" : "yyyy-MM-dd HH:mmZ",
"timestampFormatMomentJS" : "YYYY-MM-DD HH:mmZ",
"required" : true "required" : true
}, },
{ {
......
...@@ -47,17 +47,6 @@ ...@@ -47,17 +47,6 @@
$(document).ready(function () { $(document).ready(function () {
// Make sure that there is a datetime picker present for HTML5
// date input fields
$('#timeOfObservation').datetimepicker({
lang: "no",
dayOfWeekStart: 1,
format: "Y-m-d H:iO",
step: 30
});
// Load main form definition (for validation) // Load main form definition (for validation)
loadFormDefinition("observationForm"); loadFormDefinition("observationForm");
...@@ -692,10 +681,7 @@ ...@@ -692,10 +681,7 @@
<#setting time_zone=user.organizationId.defaultTimeZone!"UTC"> <#setting time_zone=user.organizationId.defaultTimeZone!"UTC">
<div class="form-group"> <div class="form-group">
<label for="timeOfObservation">${i18nBundle.timeOfObservation}</label> <label for="timeOfObservation">${i18nBundle.timeOfObservation}</label>
<input type="text" class="form-control" id="timeOfObservation" name="timeOfObservation" <input type="date" class="form-control" id="timeOfObservation" name="timeOfObservation" placeholder="${i18nBundle.timeOfObservation}" value="${observation.timeOfObservation?string("yyyy-MM-dd")!""}" onblur="validateField(this);" <#if editAccess!="W">readonly="readonly"</#if>/>
placeholder="${i18nBundle.timeOfObservation}"
value="${(observation.timeOfObservation?string("yyyy-MM-dd HH:mmZ"))!.now?string("yyyy-MM-dd HH:mmZ")}"
onblur="validateField(this);" <#if editAccess!="W">readonly="readonly"</#if>/>
<span class="help-block" id="${formId}_timeOfObservation_validation"></span> <span class="help-block" id="${formId}_timeOfObservation_validation"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment