--- loncom/homework/chemresponse.pm 2008/12/23 18:51:44 1.86 +++ loncom/homework/chemresponse.pm 2010/10/04 14:34:43 1.88 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.86 2008/12/23 18:51:44 raeburn Exp $ +# $Id: chemresponse.pm,v 1.88 2010/10/04 14:34:43 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -116,7 +116,7 @@ CHEMJS 'bgcolor' => '#FFFFFF',}); my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,}); - + my $java_not_enabled=&Apache::lonhtmlcommon::java_not_enabled(); my $body=< @@ -143,7 +143,7 @@ $js -You have to enable Java and JavaScript on your machine. +$java_not_enabled $molecule
@@ -304,9 +304,17 @@ sub end_organicresponse { $ad='INCORRECT'; } } - if ($ad && $Apache::lonhomework::type eq 'survey') { - $ad='SUBMITTED'; - } + if ($ad) { + if ($Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad='SUBMITTED_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $ad='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad='ANONYMOUS_CREDIT'; + } + } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"}; @@ -558,9 +566,17 @@ sub end_reactionresponse { $ad='INCORRECT'; } } - if ($ad && $Apache::lonhomework::type eq 'survey') { - $ad='SUBMITTED'; - } + if ($ad) { + if ($Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } elsif ($ad && $Apache::lonhomework::type eq 'surveycred') { + $ad='SUBMITTED_CREDIT'; + } elsif ($ad && $Apache::lonhomework::type eq 'anonsurvey') { + $ad='ANONYMOUS'; + } elsif ($ad && $Apache::lonhomework::type eq 'anonsurveycred') { + $ad='ANONYMOUS_CREDIT'; + } + } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; }