From f2b3db1609e720b218fce1695d6332121e205507 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Tue, 8 Jan 2019 15:39:06 +0100 Subject: [PATCH] Input check: User is not allowed to enter a observation year < 2000 --- src/main/webapp/map_applications/fireblight/js/map.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/map_applications/fireblight/js/map.js b/src/main/webapp/map_applications/fireblight/js/map.js index 451244d0..b8983e57 100755 --- a/src/main/webapp/map_applications/fireblight/js/map.js +++ b/src/main/webapp/map_applications/fireblight/js/map.js @@ -353,10 +353,15 @@ var storeFeature = function(featureId) var tiltak = document.getElementById("tiltak").options[document.getElementById("tiltak").options.selectedIndex].value; var observationText = document.getElementById("beskrivelse").value; var observationHeading = "Registrering av pærebrann"; - var timeOfObservation = moment(document.getElementById("dato").value + "+0200","DD.MM.YYYYZ").valueOf(); + var timeOfObservation = moment(document.getElementById("dato").value + "+0200","DD.MM.YYYYZ"); + if(timeOfObservation.year() < 2000) + { + alert("Feil dato (før år 2000). Datoformat er DD.MM.ÅÅÅÅ"); + return; + } feature.setProperties({ - timeOfObservation: timeOfObservation, + timeOfObservation: timeOfObservation.valueOf(), cropOrganism: cropOrganism, organism: paerebrann, observationHeading: observationHeading, -- GitLab