--- loncom/homework/inputtags.pm 2003/04/08 02:37:58 1.89 +++ loncom/homework/inputtags.pm 2003/09/23 15:44:39 1.114.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.89 2003/04/08 02:37:58 albertel Exp $ +# $Id: inputtags.pm,v 1.114.2.2 2003/09/23 15:44:39 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,7 @@ use strict; use Apache::loncommon; BEGIN { - &Apache::lonxml::register('Apache::inputtags',('textfield','textline')); + &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); } @@ -52,6 +52,8 @@ sub initialize_inputtags { @Apache::inputtags::previous_version=(); # id of current part, 0 means that no part is current (inside only $Apache::inputtags::part=''; + # list of all part ids seen + @Apache::inputtags::partlist=(); # list of problem date statuses, the first element is for # if there is a second element it is for the current @Apache::inputtags::status=(); @@ -59,6 +61,26 @@ sub initialize_inputtags { %Apache::inputtags::params=(); # list of all ids, for , these get join()ed and prepended @Apache::inputtags::import=(); + # list of all import ids seen + @Apache::inputtags::importlist=(); +} + +sub check_for_duplicate_ids { + my %check; + foreach my $id (@Apache::inputtags::partlist, + @Apache::inputtags::responselist, + @Apache::inputtags::importlist) { + $check{$id}++; + } + my @duplicates; + foreach my $id (sort(keys(%check))) { + if ($check{$id} > 1) { + push(@duplicates,$id); + } + } + if (@duplicates) { + &Apache::lonxml::error("Duplicated ids found, problem will operate incorrectly. Duplicated ids seen: ",join(', ',@duplicates)); + } } sub start_input { @@ -122,13 +144,20 @@ sub start_textfield { } else { $result=$token->[4]; } + my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); $result.=&Apache::edit::modifiedfield(); } 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); if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') { - my $number_of_lines= &Apache::lonxml::get_param('rows',$parstack,$safeeval); $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{'; - for (my $i=0;$i'; + } + } + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::end_table; + } + return $result; +} + +sub end_hiddenline { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'web') { $Apache::lonxml::evaluate++; } + elsif ($target eq 'edit') { return ('','no'); } + return ""; +} + sub finalizeawards { my $result=''; my $award; @@ -217,7 +274,9 @@ sub finalizeawards { if ($result eq '' ) { foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} } } - + if ($result eq '' ) { + foreach $award (@_) { if ($award eq 'TOO_LONG') {$result='TOO_LONG'; last;}} + } if ($result eq '' ) { foreach $award (@_) { if ($award eq 'UNIT_FAIL' || @@ -252,6 +311,9 @@ sub finalizeawards { foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } } if ($result eq '' ) { + foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} } + } + if ($result eq '' ) { foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} } } if ($result eq '' ) { $result='EXACT_ANS'; } @@ -263,81 +325,142 @@ sub decideoutput { my $message=''; my $button=0; my $previousmsg; - + my $bgcolor='orange'; + my %possiblecolors = + ( 'correct' => '#aaffaa', + 'charged_try' => '#ffaaaa', + 'not_charged_try' => '#ffffaa', + 'no_message' => '#fffff', + ); if ($previous) { $previousmsg='You have entered that answer before'; } if ($solved =~ /^correct/) { - if ($target eq 'tex') { - $message = '\textbf{You are correct}. Your receipt is '. - &Apache::lonnet::receipt; - } else { - $message = "You are correct. Your receipt is ". - &Apache::lonnet::receipt; - } - $button=0; - $previousmsg=''; + if ($award eq 'ASSIGNED_SCORE') { + $message = "A score has been assigned."; + } else { + if ($target eq 'tex') { + $message = '\textbf{You are correct}.'; + } else { + $message = "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=''; } elsif ($solved =~ /^excused/) { - $message = "You are excused from the problem."; - $button=0; - $previousmsg=''; - } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { - if ($solved =~ /^incorrect/ || $solved eq '') { - $message = "Incorrect"; - $button=1; - } else { - $message = "You are correct. Your receipt is ". - &Apache::lonnet::receipt; + if ($target eq 'tex') { + $message = ' \textbf{You are excused from the problem.} '; + } else { + $message = "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"; + $bgcolor=$possiblecolors{'charged_try'}; + $button=1; + } else { + $message = "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=''; + } } elsif ($award eq 'NO_RESPONSE') { - $message = ''; - $button=1; + $message = ''; + $bgcolor=$possiblecolors{'no_feedback'}; + $button=1; } elsif ($award eq 'MISSING_ANSWER') { - $message = 'Some parts were not submitted'; - $button = 1; + $message = 'Some parts were not submitted'; + $bgcolor=$possiblecolors{'not_charged_try'}; + $button = 1; + } elsif ($award eq 'ERROR') { + $message = '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."; + $bgcolor=$possiblecolors{'not_charged_try'}; + $button=1; } elsif ($award eq 'WANTED_NUMERIC') { - $message = "This question expects a numeric answer"; - $button=1; + $message = "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').'.'; - $button=1; + $message = 'You have provided an invalid ranking'; + if ($target ne 'tex') { + $message.=', 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.'; - $button=1; + $message = '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"; - $button=1; + $message = "Please adjust significant figures.";# 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"; - $button=1; + $message = "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"; - $button=1; + $message = "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'); - $button=1; + $message = "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"; - $button=1; + $message = "Unable to understand formula"; + $bgcolor=$possiblecolors{'not_charged_try'}; + $button=1; } elsif ($award eq 'INCORRECT') { - $message = "Incorrect"; - $button=1; + $message = "Incorrect"; + $bgcolor=$possiblecolors{'charged_try'}; + $button=1; } elsif ($award eq 'SUBMITTED') { - $message = "Your submission has been recorded."; - $button=1; + $message = "Your submission has been recorded."; + $bgcolor=$possiblecolors{'correct'}; + $button=1; } elsif ($award eq 'DRAFT') { - $message = "A draft copy has been saved."; - $button=1; + $message = "A draft copy has been saved."; + $bgcolor=$possiblecolors{'not_charged_try'}; + $button=1; + } elsif ($award eq 'ASSIGNED_SCORE') { + $message = "A score has been assigned."; + $bgcolor=$possiblecolors{'correct'}; + $button=0; } else { - $message = "Unknown message: $award"; - $button=1; + $message = "Unknown message: $award"; + $button=1; } - if ($Apache::lonhomework::type eq 'exam') {$message='';$previousmsg='';} - return ($button,$message,$previousmsg); + if (lc($Apache::lonhomework::problemstatus) eq 'no' && + $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { + $message = "Answer Submitted"; + $bgcolor=$possiblecolors{'correct'}; + $button=1; + } + return ($button,$bgcolor,$message,$previousmsg); } sub removealldata { @@ -358,20 +481,45 @@ sub setgradedata { $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; return ''; } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ - /^correct/ ) { + /^correct/ || $Apache::lonhomework::scantronmode || + lc($Apache::lonhomework::problemstatus) eq 'no') { #handle assignment of tries and solved status + my $solvemsg; + if ($Apache::lonhomework::scantronmode) { + $solvemsg='correct_by_scantron'; + } else { + $solvemsg='correct_by_student'; + } if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { $Apache::lonhomework::results{"resource.$id.afterduedate"}=''; } - if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { + if ( $award eq 'ASSIGNED_SCORE') { + $Apache::lonhomework::results{"resource.$id.tries"} = + $Apache::lonhomework::history{"resource.$id.tries"} + 1; + $Apache::lonhomework::results{"resource.$id.solved"} = + $solvemsg; + my $numawards=scalar(@Apache::inputtags::response); + $Apache::lonhomework::results{"resource.$id.awarded"} = 0; + foreach my $res (@Apache::inputtags::response) { + $Apache::lonhomework::results{"resource.$id.awarded"}+= + $Apache::lonhomework::results{"resource.$id.$res.awarded"}; + } + if ($numawards > 0) { + $Apache::lonhomework::results{"resource.$id.awarded"}/= + $numawards; + } + } elsif ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { $Apache::lonhomework::results{"resource.$id.tries"} = $Apache::lonhomework::history{"resource.$id.tries"} + 1; $Apache::lonhomework::results{"resource.$id.solved"} = - 'correct_by_student'; + $solvemsg; $Apache::lonhomework::results{"resource.$id.awarded"} = '1'; } elsif ( $award eq 'INCORRECT' ) { $Apache::lonhomework::results{"resource.$id.tries"} = $Apache::lonhomework::history{"resource.$id.tries"} + 1; + if (lc($Apache::lonhomework::problemstatus) ne 'no') { + $Apache::lonhomework::results{"resource.$id.awarded"} = 0; + } $Apache::lonhomework::results{"resource.$id.solved"} = 'incorrect_attempted' } elsif ( $award eq 'SUBMITTED' ) { @@ -388,13 +536,20 @@ sub setgradedata { } else { $Apache::lonhomework::results{"resource.$id.solved"} = 'incorrect_attempted'; + 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') { - delete($Apache::lonhomework::results{"resource.$id.tries"}); - $Apache::lonhomework::results{"resource.$id.previous"} = '1'; + 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. @@ -420,7 +575,7 @@ sub grade { my $response=''; if ( defined $ENV{'form.submitted'}) { my @awards = (); - foreach $response (@Apache::inputtags::responselist) { + foreach $response (@Apache::inputtags::response) { &Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; &Apache::lonxml::debug("keeping $value from $response for $id"); @@ -456,6 +611,7 @@ sub grade { sub gradestatus { my ($id,$target) = @_; my $showbutton = 1; + my $bgcolor = ''; my $message = ''; my $latemessage = ''; my $trystr=''; @@ -469,16 +625,16 @@ sub gradestatus { 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,$message,$previousmsg) = + ($showbutton,$bgcolor,$message,$previousmsg) = &decideoutput($award,$solved,$previous,$target); if ($target eq 'tex') { $message=' '.$message.' '; } else { - $message="$message"; + $message="$message"; if ($previousmsg) { - $previousmsg="$previousmsg"; + $previousmsg="$previousmsg"; } } } @@ -490,8 +646,8 @@ sub gradestatus { if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } if ( $showbutton ) { if ($target eq 'tex') { - if ($ENV{'request.state'} ne "construct") { - $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm '; + if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') { + $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; } else { $trystr = '\vskip 0 mm '; }