--- loncom/homework/essayresponse.pm 2009/09/11 16:34:09 1.100.4.1 +++ loncom/homework/essayresponse.pm 2010/02/28 23:37:03 1.102 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.100.4.1 2009/09/11 16:34:09 raeburn Exp $ +# $Id: essayresponse.pm,v 1.102 2010/02/28 23:37:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -55,26 +55,28 @@ sub start_essayresponse { if (!defined($maxfilesize)) { $maxfilesize = 10.0; #FIXME This should become a domain configuration } - if ( $Apache::lonhomework::type eq 'survey' ) { + if (($Apache::lonhomework::type eq 'survey') || + ($Apache::lonhomework::type eq 'surveycred') || + ($Apache::lonhomework::type eq 'anonsurvey') || + ($Apache::lonhomework::type eq 'anonsurveycred')) { $result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> '; } $result.='<br /><table border="1">'; - if ( $Apache::lonhomework::type ne 'survey' ) { - if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { - $result .= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />'; - } else { - $result.= '<tr><td>'. - '<label>'. - '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. - &mt('Submit entries below as answer to receive credit'). - '</label> <br />'. - '<label>'. - '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. - &mt('Save entries below as a draft answer (not submitting them for credit yet)'). - '</label>'. - '</td></tr>'; - } - } + if (($Apache::lonhomework::type ne 'survey') && + ($Apache::lonhomework::type ne 'surveycred') && + ($Apache::lonhomework::type eq 'anonsurvey') && + ($Apache::lonhomework::type ne 'anonsurveycred')) { + $result.= '<tr><td>'. + '<label>'. + '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. + &mt('Submit entries below as answer to receive credit'). + '</label> <br />'. + '<label>'. + '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. + &mt('Save entries below (not submitted for credit yet)'). + '</label>'. + '</td></tr>'; + } if ($ncol > 0) { $result .='<tr><td>'.'<label>'. @@ -150,7 +152,15 @@ sub end_essayresponse { if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { my $award='DRAFT'; if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { - $award='SUBMITTED'; + if ($Apache::lonhomework::type eq 'anonsurvey') { + $award='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $award='ANONYMOUS_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $award='SUBMITTED_CREDIT'; + } else { + $award='SUBMITTED'; + } } my $uploadedflag=0; my $totalsize=0;