--- loncom/homework/inputtags.pm 2003/06/24 19:18:01 1.107 +++ loncom/homework/inputtags.pm 2004/02/06 22:36:40 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.107 2003/06/24 19:18:01 albertel Exp $ +# $Id: inputtags.pm,v 1.129 2004/02/06 22:36:40 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,13 +24,12 @@ # /home/httpd/html/adm/gpl.txt # # http://www.lon-capa.org/ -# -# 2/19 Guy package Apache::inputtags; use HTML::Entities(); use strict; use Apache::loncommon; +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); @@ -97,6 +96,16 @@ sub end_input { return ''; } +sub addchars { + my ($fieldid,$addchars)=@_; + my $output=''; + foreach (split(/\,/,$addchars)) { + $output.=''.$_.' '; + } + return $output; +} + sub start_textfield { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result = ""; @@ -111,7 +120,12 @@ sub start_textfield { if ( $cols eq '') { $cols = 80; } my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); if ( $rows eq '') { $rows = 10; } - $result= '".$oldresponse; if ($oldresponse ne '') { #get rid of any startup text if the user has already responded @@ -134,18 +148,19 @@ sub start_textfield { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Rows:','rows',$token,4); $result.=&Apache::edit::text_arg('Columns:','cols',$token,4); + $result.=&Apache::edit::text_arg + ('Click-On Texts (comma sep):','addchars',$token,10); my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'rows','cols'); + $safeeval,'rows','cols','addchars'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } else { $result=$token->[4]; } - my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); - $result.=&Apache::edit::modifiedfield(); + $result.=&Apache::edit::modifiedfield("/textfield",$parser); } elsif ($target eq 'tex') { my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); @@ -193,7 +208,12 @@ sub start_textline { } my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); if ($Apache::lonhomework::type ne 'exam') { - $result= ''; } } else { @@ -203,10 +223,12 @@ sub start_textline { } } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::text_arg('Size:','size',$token,'5').""; + $result.=&Apache::edit::text_arg('Size:','size',$token,'5'). + &Apache::edit::text_arg + ('Click-On Texts (comma sep):','addchars',$token,10).""; $result.=&Apache::edit::end_table; } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size'); + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); @@ -332,35 +354,51 @@ sub decideoutput { 'not_charged_try' => '#ffffaa', 'no_message' => '#fffff', ); - if ($previous) { $previousmsg='You have entered that answer before'; } + if ($previous) { $previousmsg=&mt('You have entered that answer before'); } if ($solved =~ /^correct/) { if ($award eq 'ASSIGNED_SCORE') { - $message = "A score has been assigned."; + $message = &mt("A score has been assigned."); } else { if ($target eq 'tex') { - $message = '\textbf{You are correct}.'; + $message = '\textbf{'.&mt('You are correct.').'}'; } else { - $message = "You are correct."; + $message = "".&mt('You are correct.').""; + } + unless ($ENV{'course.'. + $ENV{'request.course.id'}. + '.disable_receipt_display'} eq 'yes') { + $message.=(($target eq 'web')?'':' '). + &mt('Your receipt is').' '.&Apache::lonnet::receipt(). + (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); } - $message.=' Your receipt is '.&Apache::lonnet::receipt; } $bgcolor=$possiblecolors{'correct'}; $button=0; $previousmsg=''; } elsif ($solved =~ /^excused/) { - $message = "You are excused from the problem."; + if ($target eq 'tex') { + $message = ' \textbf{'.&mt('You are excused from the problem.').'} '; + } else { + $message = "".&mt('You are excused from the problem.').""; + } $bgcolor=$possiblecolors{'charged_try'}; $button=0; $previousmsg=''; } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { if ($solved =~ /^incorrect/ || $solved eq '') { - $message = "Incorrect"; + $message = &mt("Incorrect"); $bgcolor=$possiblecolors{'charged_try'}; $button=1; } else { - $message = "You are correct. Your receipt is ". - &Apache::lonnet::receipt; + $message = "".&mt('You are correct.').""; + unless ($ENV{'course.'. + $ENV{'request.course.id'}. + '.disable_receipt_display'} eq 'yes') { + $message.=(($target eq 'web')?'':' '). + 'Your receipt is '.&Apache::lonnet::receipt(). + (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); + } $bgcolor=$possiblecolors{'correct'}; $button=0; $previousmsg=''; @@ -370,58 +408,60 @@ sub decideoutput { $bgcolor=$possiblecolors{'no_feedback'}; $button=1; } elsif ($award eq 'MISSING_ANSWER') { - $message = 'Some parts were not submitted'; + $message = &mt('Some parts were not submitted.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button = 1; } elsif ($award eq 'ERROR') { - $message = 'An error occured while grading your answer.'; + $message = &mt('An error occured while grading your answer.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button = 1; } elsif ($award eq 'TOO_LONG') { - $message = "The submitted answer was too long."; + $message = &mt("The submitted answer was too long."); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'WANTED_NUMERIC') { - $message = "This question expects a numeric answer"; + $message = &mt("This question expects a numeric answer."); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'MISORDERED_RANK') { - $message = 'You have provided an invalid ranking, please refer to '. - &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; + $message = &mt('You have provided an invalid ranking'); + if ($target ne 'tex') { + $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; + } $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'INVALID_FILETYPE') { - $message = 'The filetype extension of the file you uploaded is not allowed.'; + $message = &mt('The filetype extension of the file you uploaded is not allowed.'); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'SIG_FAIL') { - $message = "Please adjust significant figures.";# you provided %s significant figures"; + $message = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures"; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_FAIL') { - $message = "Units incorrect. ". - &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; + $message = &mt("Units incorrect."); + if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s"; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'UNIT_NOTNEEDED') { - $message = "Only a number required.";# Computer reads units of %s"; + $message = &mt("Only a number required.");# Computer reads units of %s"; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'NO_UNIT') { - $message = "Units required". - &Apache::loncommon::help_open_topic('Physical_Units'); + $message = &mt("Units required"); + if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'BAD_FORMULA') { - $message = "Unable to understand formula"; + $message = &mt("Unable to understand formula"); $bgcolor=$possiblecolors{'not_charged_try'}; $button=1; } elsif ($award eq 'INCORRECT') { - $message = "Incorrect"; + $message = &mt("Incorrect"); $bgcolor=$possiblecolors{'charged_try'}; $button=1; } elsif ($award eq 'SUBMITTED') { - $message = "Your submission has been recorded."; + $message = &mt("Your submission has been recorded."); $bgcolor=$possiblecolors{'correct'}; $button=1; } elsif ($award eq 'DRAFT') { @@ -433,11 +473,12 @@ sub decideoutput { $bgcolor=$possiblecolors{'correct'}; $button=0; } else { - $message = "Unknown message: $award"; + $message = &mt("Unknown message").": $award"; $button=1; } - if (lc($Apache::lonhomework::problemstatus) eq 'no') { - $message = "Answer Submitted"; + if (lc($Apache::lonhomework::problemstatus) eq 'no' && + $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { + $message = &mt("Answer Submitted: Your final submission will be graded after the due date."); $bgcolor=$possiblecolors{'correct'}; $button=1; } @@ -457,7 +498,8 @@ sub removealldata { sub setgradedata { my ($award,$id,$previously_used) = @_; # if the student already has it correct, don't modify the status - if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && + if (!$Apache::lonhomework::scantronmode && + $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; return ''; @@ -498,6 +540,9 @@ sub setgradedata { } elsif ( $award eq 'INCORRECT' ) { $Apache::lonhomework::results{"resource.$id.tries"} = $Apache::lonhomework::history{"resource.$id.tries"} + 1; + if (lc($Apache::lonhomework::problemstatus) eq 'no') { + $Apache::lonhomework::results{"resource.$id.awarded"} = 0; + } $Apache::lonhomework::results{"resource.$id.solved"} = 'incorrect_attempted' } elsif ( $award eq 'SUBMITTED' ) { @@ -517,24 +562,32 @@ sub setgradedata { if (lc($Apache::lonhomework::problemstatus) eq 'no') { $Apache::lonhomework::results{"resource.$id.tries"} = $Apache::lonhomework::history{"resource.$id.tries"} + 1; + $Apache::lonhomework::results{"resource.$id.awarded"} = 0; } } - # check if this was a previous submission if it was delete the - # unneeded data and update the previously_used attribute - if ( $previously_used eq 'PREVIOUSLY_USED') { - if (lc($Apache::lonhomework::problemstatus) ne 'no') { - delete($Apache::lonhomework::results{"resource.$id.tries"}); - $Apache::lonhomework::results{"resource.$id.previous"} = '1'; - } - } elsif ( $previously_used eq 'PREVIOUSLY_LAST') { - #delete all data as they student didn't do anything, but save - #the list of collaborators. - &removealldata($id); - #and since they didn't do anything we were never here - return ''; - } else { - $Apache::lonhomework::results{"resource.$id.previous"} = '0'; + # did either of the overall awards chage? If so ignore the + # previous check + if (($Apache::lonhomework::results{"resource.$id.awarded"} eq + $Apache::lonhomework::history{"resource.$id.awarded"}) && + ($Apache::lonhomework::results{"resource.$id.solved"} eq + $Apache::lonhomework::history{"resource.$id.solved"})) { + # check if this was a previous submission if it was delete the + # unneeded data and update the previously_used attribute + if ( $previously_used eq 'PREVIOUSLY_USED') { + if (lc($Apache::lonhomework::problemstatus) ne 'no') { + delete($Apache::lonhomework::results{"resource.$id.tries"}); + $Apache::lonhomework::results{"resource.$id.previous"} = '1'; + } + } elsif ( $previously_used eq 'PREVIOUSLY_LAST') { + #delete all data as they student didn't do anything, but save + #the list of collaborators. + &removealldata($id); + #and since they didn't do anything we were never here + return ''; + } else { + $Apache::lonhomework::results{"resource.$id.previous"} = '0'; + } } } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~ /^correct/ ) { @@ -597,12 +650,13 @@ sub gradestatus { my $status = $Apache::inputtags::status['-1']; &Apache::lonxml::debug("gradestatus has :$status:"); - if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') { + if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && + $status ne 'INVALID_ACCESS') { my $award = $Apache::lonhomework::history{"resource.$id.award"}; my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; &Apache::lonxml::debug("Found Award |$award|$solved|"); - if ( $award ne '' ) { + if ( $award ne '' || $solved ne '') { &Apache::lonxml::debug('Getting message'); ($showbutton,$bgcolor,$message,$previousmsg) = &decideoutput($award,$solved,$previous,$target); @@ -618,24 +672,34 @@ sub gradestatus { my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); &Apache::lonxml::debug("got maxtries of :$maxtries:"); + #if tries are set to negative turn off the Tries/Button and messages + if (defined($maxtries) && $maxtries < 0) { return ''; } if ( $tries eq '' ) { $tries = '0'; } if ( $maxtries eq '' ) { $maxtries = '2'; } if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } if ( $showbutton ) { if ($target eq 'tex') { if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') { - $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; + $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; } else { $trystr = '\vskip 0 mm '; } } else { - $trystr = "Tries $tries/$maxtries"; + $trystr = "".&mt('Tries')." $tries"; + if($ENV{'request.state'} ne 'construct') { + $trystr.="/$maxtries"; + } else { + if (defined($Apache::inputtags::params{'maxtries'})) { + $trystr.="/".$Apache::inputtags::params{'maxtries'}; + } + } + $trystr.=""; } } if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} if ( $showbutton ) { if ($target ne 'tex') { - $button = ''; + $button = ''; } } if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { @@ -654,7 +718,7 @@ sub gradestatus { if ($target eq 'tex') { return $button.' \vskip 0 mm '.$output.' '; } else { - return $button.''.$output.''; + return ''.$button.''.$output.''; } } }