oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Survey Date question type server-side validation, and made

Browse source 
all validation messages generate debug output
This commit is contained in:
Patrick Donelan 2009-06-02 01:48:41 +00:00
parent 45d1791876
commit 7faa9c3e9d
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
View file

@ -572,17 +572,25 @@ sub recordResponses {
if ( $questionType eq 'Country' ) {
# Must be a valid country
next if !grep { $_ eq $recordedAnswer } WebGUI::Form::Country->getCountries;
if (!grep { $_ eq $recordedAnswer } WebGUI::Form::Country->getCountries) {
$self->session->log->debug("Invalid $questionType: $recordedAnswer");
next;
}
}
elsif ( $questionType eq 'Date' ) {
# Must be a valid date (until we get date i18n this is limited to YYYY/MM/DD)
next if $recordedAnswer !~ m|^\d{4}/\d{2}/\d{2}$|;
if ($recordedAnswer !~ m|^\d{4}/\d{1,2}/\d{1,2}$|) {
$self->session->log->debug("Invalid $questionType: $recordedAnswer");
next;
}
}
elsif ( $questionType eq 'Number' || $questionType eq 'Slider' ) {
if ( $answer->{max} =~ /\d/ and $recordedAnswer > $answer->{max} ) {
$self->session->log->debug("Invalid $questionType: $recordedAnswer");
next;
}
elsif ( $answer->{min} =~ /\d/ and $recordedAnswer < $answer->{min} ) {
$self->session->log->debug("Invalid $questionType: $recordedAnswer");
next;
}
}
@ -593,7 +601,10 @@ sub recordResponses {
else {
# In the case of a mc question, only selected answers will have a defined recordedAnswer
# Thus we skip any answers where recordedAnswer is not defined
next if !defined $recordedAnswer || $recordedAnswer !~ /\S/;
if (!defined $recordedAnswer || $recordedAnswer !~ /\S/) {
$self->session->log->debug("Invalid $questionType: $recordedAnswer");
next;
}
}
# If we reach here, answer validated ok