diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 2aa30564b..d4c6c37d6 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -938,16 +938,18 @@ sub prepareShowSurveyTemplate { 'Confidence', 1, 'Effectiveness', 1, 'Concern', 1, 'Risk', 1, 'Threat', 1, 'Security', 1 ); - my %text = ( 'Text', 1, 'Email', 1, 'Phone Number', 1, 'Text Date', 1, 'Currency', 1 ); - my %slider = ( 'Slider', 1, 'Dual Slider - Range', 1, 'Multi Slider - Allocate', 1 ); - my %dateType = ( 'Date', 1, 'Date Range', 1 ); - my %fileUpload = ( 'File Upload', 1 ); - my %hidden = ( 'Hidden', 1 ); + my %textArea = ( 'TextArea', 1 ); + my %text = ( 'Text', 1, 'Email', 1, 'Phone Number', 1, 'Text Date', 1, 'Currency', 1 ); + my %slider = ( 'Slider', 1, 'Dual Slider - Range', 1, 'Multi Slider - Allocate', 1 ); + my %dateType = ( 'Date', 1, 'Date Range', 1 ); + my %fileUpload = ( 'File Upload', 1 ); + my %hidden = ( 'Hidden', 1 ); foreach my $q (@$questions) { - if ( $fileUpload{ $$q{'questionType'} } ) { $q->{'fileLoader'} = 1; } - elsif ( $text{ $$q{'questionType'} } ) { $q->{'textType'} = 1; } - elsif ( $hidden{ $$q{'questionType'} } ) { $q->{'hidden'} = 1; } + if ( $fileUpload{ $$q{'questionType'} } ) { $q->{'fileLoader'} = 1; } + elsif ( $text{ $$q{'questionType'} } ) { $q->{'textType'} = 1; } + elsif ( $textArea{ $$q{'questionType'} } ) { $q->{'textAreaType'} = 1; } + elsif ( $hidden{ $$q{'questionType'} } ) { $q->{'hidden'} = 1; } elsif ( $multipleChoice{ $$q{'questionType'} } ) { $q->{'multipleChoice'} = 1; if ( $$q{'maxAnswers'} > 1 ) { diff --git a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm index 12ab7715f..7c16258d1 100644 --- a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm +++ b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm @@ -388,7 +388,7 @@ sub recordResponses { 'Yes/No', 1 ); my %sliderTypes = ( 'Dual Slider - Range', 1, 'Multi Slider - Allocate', 1, 'Slider', 1 ); - my %textTypes = ( 'Currency', 'Email', 1, 'Phone Number', 1, 'Text', 1, 'Text Date', 1 ); + my %textTypes = ( 'Currency', 'Email', 1, 'Phone Number', 1, 'Text', 1, 'Text Date', 1 ,'TextArea', 1); my %fileTypes = ( 'File Upload', 1 ); my %dateTypes = ( 'Date', 'Date Range', 1 ); my %hiddenTypes = ( 'Hidden', 1 ); diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm index 57952ff45..73a3a17f1 100644 --- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm +++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm @@ -381,8 +381,8 @@ sub getValidQuestionTypes { 'Likelihood', 'Multi Slider - Allocate', 'Multiple Choice', 'Oppose/Support', 'Party', 'Phone Number', 'Race', 'Risk', 'Satisfaction', 'Scale', 'Security', 'Slider', - 'Text', 'Text Date', 'Threat', 'True/False', - 'Yes/No' + 'Text', 'TextArea', 'Text Date', 'Threat', + 'True/False', 'Yes/No' ); } diff --git a/root_import_survey.wgpkg b/root_import_survey.wgpkg index a2cb1e824..d663c54c0 100644 Binary files a/root_import_survey.wgpkg and b/root_import_survey.wgpkg differ diff --git a/www/extras/wobject/Survey/administersurvey.js b/www/extras/wobject/Survey/administersurvey.js index 8bf8dc8e7..c16533830 100644 --- a/www/extras/wobject/Survey/administersurvey.js +++ b/www/extras/wobject/Survey/administersurvey.js @@ -36,7 +36,8 @@ if (typeof Survey === "undefined") { 'Email': 1, 'Phone Number': 1, 'Text Date': 1, - 'Currency': 1 + 'Currency': 1, + 'TextArea': 1 }; var slider = { 'Slider': 1,