diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java index f1245ab0fbc2d6e6b1a0c1550e4b1516af7ee3d9..e9356c024589c94bb81d3eff8960729a425bbb1c 100755 --- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java +++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java @@ -411,7 +411,7 @@ public class ObservationController extends HttpServlet { formValidation.getFormField("cropOrganismId").getValueAsInteger())); } observation.setTimeOfObservation( - formValidation.getFormField("timeOfObservation").getValueAsTimestamp()); + formValidation.getFormField("timeOfObservation").getValueAsDate()); if (observationId <= 0) { observation.setUserId(user.getUserId()); } else { diff --git a/src/main/webapp/formdefinitions/observationForm.json b/src/main/webapp/formdefinitions/observationForm.json index 1c1ca45d8ee6b3b9fe3ef75bdba6dd08f7501752..82fa5aab502ab2eecb64c19152d57259c4d49487 100755 --- a/src/main/webapp/formdefinitions/observationForm.json +++ b/src/main/webapp/formdefinitions/observationForm.json @@ -40,9 +40,7 @@ }, { "name" : "timeOfObservation", - "dataType" : "TIMESTAMP", - "timestampFormat" : "yyyy-MM-dd HH:mmZ", - "timestampFormatMomentJS" : "YYYY-MM-DD HH:mmZ", + "dataType" : "DATE", "required" : true }, { diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl index f02c628414084959b4b3c933a3fedab97e55e70c..d4cd9e01b7de265fff78eb981a2d5bd1f49f0bba 100755 --- a/src/main/webapp/templates/observationForm.ftl +++ b/src/main/webapp/templates/observationForm.ftl @@ -47,17 +47,6 @@ $(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) loadFormDefinition("observationForm"); @@ -692,10 +681,7 @@ <#setting time_zone=user.organizationId.defaultTimeZone!"UTC"> <div class="form-group"> <label for="timeOfObservation">${i18nBundle.timeOfObservation}</label> - <input type="text" class="form-control" id="timeOfObservation" name="timeOfObservation" - 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>/> + <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>/> <span class="help-block" id="${formId}_timeOfObservation_validation"></span> </div> <div class="form-group">