--- loncom/homework/inputtags.pm 2007/03/01 02:30:03 1.217
+++ loncom/homework/inputtags.pm 2007/05/29 21:14:45 1.226
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.217 2007/03/01 02:30:03 albertel Exp $
+# $Id: inputtags.pm,v 1.226 2007/05/29 21:14:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -586,14 +586,14 @@ sub decideoutput {
my $message='';
my $button=0;
my $previousmsg;
- my $bgcolor='orange';
+ my $css_class='orange';
my $added_computer_text=0;
- my %possiblecolors =
- ( 'correct' => '#aaffaa',
- 'charged_try' => '#ffaaaa',
- 'not_charged_try' => '#ffffaa',
- 'no_grade' => '#ffffaa',
- 'no_message' => '#ffffff',
+ my %possible_class =
+ ( 'correct' => 'LC_answer_correct',
+ 'charged_try' => 'LC_answer_charged_try',
+ 'not_charged_try' => 'LC_answer_not_charged_try',
+ 'no_grade' => 'LC_answer_no_grade',
+ 'no_message' => 'LC_no_message',
);
my $part = $Apache::inputtags::part;
@@ -607,14 +607,14 @@ sub decideoutput {
if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
if ($solved =~ /^correct/) {
- $bgcolor=$possiblecolors{'correct'};
+ $css_class=$possible_class{'correct'};
$message=&mt('You are correct.');
if ($awarded < 1 && $awarded > 0) {
$message=&mt('You are partially correct.');
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
} elsif ($awarded < 1) {
$message=&mt('Incorrect.');
- $bgcolor=$possiblecolors{'charged_try'};
+ $css_class=$possible_class{'charged_try'};
}
if ($env{'request.filename'} =~
m|/res/lib/templates/examupload.problem$|) {
@@ -629,10 +629,10 @@ sub decideoutput {
}
$added_computer_text=1;
my ($symb) = &Apache::lonnet::whichuser();
- if ((!$env{'course.'.
- $env{'request.course.id'}.
- '.disable_receipt_display'} eq 'yes')&&
- $symb) {
+ if (($symb ne '')
+ &&
+ ($env{'course.'.$env{'request.course.id'}.
+ '.disable_receipt_display'} ne 'yes')) {
$message.=(($target eq 'web')?' ':' ').
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
@@ -646,13 +646,13 @@ sub decideoutput {
} else {
$message = "".&mt('You are excused from the problem.')."";
}
- $bgcolor=$possiblecolors{'charged_try'};
+ $css_class=$possible_class{'charged_try'};
$button=0;
$previousmsg='';
} elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
if ($solved =~ /^incorrect/ || $solved eq '') {
$message = &mt("Incorrect").".";
- $bgcolor=$possiblecolors{'charged_try'};
+ $css_class=$possible_class{'charged_try'};
$button=1;
} else {
if ($target eq 'tex') {
@@ -669,105 +669,105 @@ sub decideoutput {
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
}
- $bgcolor=$possiblecolors{'correct'};
+ $css_class=$possible_class{'correct'};
$button=0;
$previousmsg='';
}
} elsif ($award eq 'NO_RESPONSE') {
$message = '';
- $bgcolor=$possiblecolors{'no_feedback'};
+ $css_class=$possible_class{'no_feedback'};
$button=1;
} elsif ($award eq 'EXTRA_ANSWER') {
$message = &mt('Some extra items were submitted.');
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button = 1;
} elsif ($award eq 'MISSING_ANSWER') {
$message = &mt('Some items were not submitted.');
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button = 1;
} elsif ($award eq 'ERROR') {
$message = &mt('An error occured while grading your answer.');
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button = 1;
} elsif ($award eq 'TOO_LONG') {
$message = &mt("The submitted answer was too long.");
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'WANTED_NUMERIC') {
$message = &mt("This question expects a numeric answer.");
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'MISORDERED_RANK') {
$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'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'SIG_FAIL') {
my ($used,$min,$max)=split(':',$awardmsg);
my $word = ($used < $min) ? 'more' : 'fewer';
$message = &mt("Submission not graded. Use $word digits.",$used);
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_STUDENT') {
$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'NO_UNIT') {
$message = &mt("Units required").'.';
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'COMMA_FAIL') {
$message = &mt("Proper comma separation is required").'.';
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'BAD_FORMULA') {
$message = &mt("Unable to understand formula");
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'INCORRECT') {
$message = &mt("Incorrect").'.';
- $bgcolor=$possiblecolors{'charged_try'};
+ $css_class=$possible_class{'charged_try'};
$button=1;
} elsif ($award eq 'SUBMITTED') {
$message = &mt("Your submission has been recorded.");
- $bgcolor=$possiblecolors{'no_grade'};
+ $css_class=$possible_class{'no_grade'};
$button=1;
} elsif ($award eq 'DRAFT') {
$message = &mt("A draft copy has been saved.");
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'ASSIGNED_SCORE') {
$message = &mt("A score has been assigned.");
- $bgcolor=$possiblecolors{'correct'};
+ $css_class=$possible_class{'correct'};
$button=0;
} elsif ($award eq '') {
if ($handgrade && $Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {
$message = &mt("Nothing submitted.");
- $bgcolor=$possiblecolors{'charged_try'};
+ $css_class=$possible_class{'charged_try'};
} else {
- $bgcolor=$possiblecolors{'not_charged_try'};
+ $css_class=$possible_class{'not_charged_try'};
}
$button=1;
} else {
@@ -791,7 +791,7 @@ sub decideoutput {
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{'no_grade'};
+ $css_class=$possible_class{'no_grade'};
$button=1;
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
@@ -799,7 +799,7 @@ sub decideoutput {
$message.= $computer;
$added_computer_text=1;
}
- return ($button,$bgcolor,$message,$previousmsg);
+ return ($button,$css_class,$message,$previousmsg);
}
sub markup_unit {
@@ -957,6 +957,42 @@ sub setgradedata {
}
}
+sub find_which_previous {
+ my ($version) = @_;
+ my $part = $Apache::inputtags::part;
+ my (@previous_version);
+ foreach my $resp (@Apache::inputtags::response) {
+ my $key = "$version:resource.$part.$resp.submission";
+ my $submission = $Apache::lonhomework::history{$key};
+ my %previous = &Apache::response::check_for_previous($submission,
+ $part,$resp,
+ $version);
+ push(@previous_version,$previous{'version'});
+ }
+ return &previous_match(\@previous_version,
+ scalar(@Apache::inputtags::response));
+}
+
+sub previous_match {
+ my ($previous_array,$count) = @_;
+ my $match = 0;
+ my @matches;
+ foreach my $versionar (@$previous_array) {
+ foreach my $version (@$versionar) {
+ $matches[$version]++;
+ }
+ }
+ my $which=0;
+ foreach my $elem (@matches) {
+ if ($elem eq $count) {
+ $match=1;
+ last;
+ }
+ $which++;
+ }
+ return ($match,$which);
+}
+
sub grade {
my ($target) = @_;
my $id = $Apache::inputtags::part;
@@ -975,14 +1011,10 @@ sub grade {
my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs);
my $previously_used;
if ( $#Apache::inputtags::previous eq $#awards ) {
- my $match=0;
- my @matches;
- foreach my $versionar (@Apache::inputtags::previous_version) {
- foreach my $version (@$versionar) {
- $matches[$version]++;
- }
- }
- foreach my $elem (@matches) {if ($elem eq ($#awards+1)) {$match=1;}}
+ my ($match) =
+ &previous_match(\@Apache::inputtags::previous_version,
+ scalar(@Apache::inputtags::response));
+
if ($match) {
$previously_used = 'PREVIOUSLY_LAST';
foreach my $value (@Apache::inputtags::previous) {
@@ -1013,15 +1045,15 @@ sub get_grade_messages {
&Apache::lonxml::debug("Found Award |$award|$solved|$awardmsg");
if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') {
&Apache::lonxml::debug('Getting message');
- ($showbutton,my $bgcolor,$message,$previousmsg) =
+ ($showbutton,my $css_class,$message,$previousmsg) =
&decideoutput($award,$awarded,$awardmsg,$solved,$previous,
$target);
if ($target eq 'tex') {
$message='\vskip 2 mm '.$message.' ';
} else {
- $message="
$message
";
+ $message="
$message
";
if ($previousmsg) {
- $previousmsg="
$previousmsg
";
+ $previousmsg="
$previousmsg
";
}
}
}
@@ -1062,18 +1094,19 @@ sub get_grade_messages {
$trystr.="";
}
}
+
if ($Apache::lonhomework::history{"$prefix.afterduedate"}) {
#last submissions was after due date
$latemessage=&mt(' The last submission was after the Due Date ');;
if ($target eq 'web') {
- $latemessage='
'.$latemessage.'
';
+ $latemessage='
'.$latemessage.'
';
}
}
return ($previousmsg,$latemessage,$message,$trystr,$showbutton);
}
sub gradestatus {
- my ($id,$target) = @_;
+ my ($id,$target,$no_previous) = @_;
my $showbutton = 1;
my $message = '';
my $latemessage = '';
@@ -1095,6 +1128,9 @@ sub gradestatus {
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
$showbutton = 0;
}
+ if ( $status eq 'SHOW_ANSWER') {
+ undef($previousmsg);
+ }
if ( $showbutton ) {
if ($target ne 'tex') {
$button = '';
@@ -1109,7 +1145,13 @@ sub gradestatus {
if ($target eq 'tex') {
return $button.' \vskip 0 mm '.$output.' ';
} else {
- return '
'.$button.'
'.$output.'
'.&previous_tries($id,$target).'
';
+ $output =
+ '
'.$button.'
'.$output;
+ if (!$no_previous) {
+ $output.='
'.&previous_tries($id,$target).'
';
+ }
+ $output.= '
';
+ return $output;
}
}
}
@@ -1118,24 +1160,47 @@ sub previous_tries {
my ($id,$target) = @_;
my $output;
my $status = $Apache::inputtags::status['-1'];
-
+
+ my $count;
+ my %count_lookup;
+
foreach my $i (1..$Apache::lonhomework::history{'version'}) {
my $prefix = $i.":resource.$id";
next if (!exists($Apache::lonhomework::history{"$prefix.award"}));
+ $count++;
+ $count_lookup{$i} = $count;
+
my ($previousmsg,$latemessage,$message,$trystr);
($previousmsg,$latemessage,$message,$trystr) =
&get_grade_messages($id,"$prefix",$target,$status);
- if (!exists($Apache::lonhomework::history{"$prefix.tries"})) {
- undef($trystr);
- }
-
- if ($previousmsg eq '') { $previousmsg='
'; }
- if ($trystr eq '') { $trystr = '
'; }
- $output.='
';
- $output.=$message.$previousmsg.$trystr;
+ if ($previousmsg ne '') {
+ my ($match,$which) = &find_which_previous($i);
+ $message=$previousmsg;
+ my $previous = $count_lookup{$which};
+ $message =~ s{()}{ as submission \# $previous $1};
+ } elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
+ if (!(lc($Apache::lonhomework::problemstatus) eq 'no'
+ && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
+ && $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
+ ) {
+
+ $message =~ s{()(.*?)()}
+ {$1 Correct. $3}s;
+ }
+ my $trystr = "(Try ".
+ $Apache::lonhomework::history{"$prefix.tries"}.')';
+ $message =~ s{()}{ $trystr $1};
+ }
+ my ($class) = ($message =~ m{)}{
};
+
+
+ $output.='
';
+ $output.='
'.$count.'
';
+ $output.=$message;
foreach my $resid (@Apache::inputtags::response) {
my $prefix = $prefix.".$resid";
@@ -1151,15 +1216,20 @@ sub previous_tries {
$output.='