From 4fb3d9f67abfdd3aeec6946c5454379d1e5f8ad9 Mon Sep 17 00:00:00 2001
From: Lene Wasskog <lene.wasskog@nibio.no>
Date: Tue, 6 May 2025 13:57:20 +0200
Subject: [PATCH] feat: Change dataType to date for timeOfObservation
---
.../servlet/ObservationController.java | 2 +-
.../webapp/formdefinitions/observationForm.json | 4 +---
src/main/webapp/templates/observationForm.ftl | 16 +---------------
3 files changed, 3 insertions(+), 19 deletions(-)
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 f1245ab0..e9356c02 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 1c1ca45d..82fa5aab 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 f02c6284..d4cd9e01 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">
--
GitLab