From 9c228e2c83838fde6bb67c31e86d6cd98449ef38 Mon Sep 17 00:00:00 2001 From: Patrick Donelan Date: Tue, 21 Apr 2009 03:32:27 +0000 Subject: [PATCH] Improved Survey "Year Month" validation --- lib/WebGUI/i18n/English/Asset_Survey.pm | 2 +- www/extras/wobject/Survey/administersurvey.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm index 30bf2df3e..992cb3ae4 100644 --- a/lib/WebGUI/i18n/English/Asset_Survey.pm +++ b/lib/WebGUI/i18n/English/Asset_Survey.pm @@ -1370,7 +1370,7 @@ section/answer.|, }, 'year' => { - message => q|Year:|, + message => q|Year (YYYY):|, context => q|Sub-label for "Year Month" question type|, lastUpdated => 0, }, diff --git a/www/extras/wobject/Survey/administersurvey.js b/www/extras/wobject/Survey/administersurvey.js index bf545b1fc..8aacfd901 100644 --- a/www/extras/wobject/Survey/administersurvey.js +++ b/www/extras/wobject/Survey/administersurvey.js @@ -88,7 +88,9 @@ if (typeof Survey === "undefined") { var m = document.getElementById(z1+'-month').value; var y = document.getElementById(z1+'-year').value; if(m == ''){ answered = 0; } - if(y.length != 4) { answered = 0; } + var yInt = parseInt(y, 10); + if(!yInt) { answered = 0; } + if(yInt < 1000 || yInt > 3000) { answered = 0; } if(answered == 1){ document.getElementById(z1).value = m + "-" + y; } } }