--- loncom/homework/inputtags.pm 2004/02/12 15:50:33 1.130 +++ loncom/homework/inputtags.pm 2004/03/05 21:31:07 1.134 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.130 2004/02/12 15:50:33 sakharuk Exp $ +# $Id: inputtags.pm,v 1.134 2004/03/05 21:31:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,6 +62,8 @@ sub initialize_inputtags { @Apache::inputtags::import=(); # list of all import ids seen @Apache::inputtags::importlist=(); + # just used to note whether we have seen a response that isn't in a part + $Apache::inputtags::response_with_no_part=0; } sub check_for_duplicate_ids { @@ -369,7 +371,7 @@ sub decideoutput { $ENV{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { $message.=(($target eq 'web')?'
':' '). - &mt('Your receipt is').' '.&Apache::lonnet::receipt(). + &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part). (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); } } @@ -396,7 +398,7 @@ sub decideoutput { $ENV{'request.course.id'}. '.disable_receipt_display'} eq 'yes') { $message.=(($target eq 'web')?'
':' '). - 'Your receipt is '.&Apache::lonnet::receipt(). + 'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part). (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); } $bgcolor=$possiblecolors{'correct'}; @@ -408,7 +410,7 @@ sub decideoutput { $bgcolor=$possiblecolors{'no_feedback'}; $button=1; } elsif ($award eq 'MISSING_ANSWER') { - $message = &mt('Some parts were not submitted.'); + $message = &mt('Some items were not submitted.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button = 1; } elsif ($award eq 'ERROR') { @@ -677,15 +679,17 @@ sub gradestatus { if ( $tries eq '' ) { $tries = '0'; } if ( $maxtries eq '' ) { $maxtries = '2'; } if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } + my $tries_text=&mt('Tries'); + if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); } if ( $showbutton ) { if ($target eq 'tex') { if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') { - $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; + $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; } else { $trystr = '\vskip 0 mm '; } } else { - $trystr = "".&mt('Tries')." $tries"; + $trystr = "".$tries_text." $tries"; if($ENV{'request.state'} ne 'construct') { $trystr.="/$maxtries"; } else {