version 1.36, 2001/06/27 18:51:37
|
version 1.53, 2002/03/01 00:23:04
|
Line 1
|
Line 1
|
# The LearningOnline Network with CAPA |
# The LearningOnline Network with CAPA |
# input definitons |
# input definitons |
|
# |
|
# $Id$ |
|
# |
|
# Copyright Michigan State University Board of Trustees |
|
# |
|
# This file is part of the LearningOnline Network with CAPA (LON-CAPA). |
|
# |
|
# LON-CAPA is free software; you can redistribute it and/or modify |
|
# it under the terms of the GNU General Public License as published by |
|
# the Free Software Foundation; either version 2 of the License, or |
|
# (at your option) any later version. |
|
# |
|
# LON-CAPA is distributed in the hope that it will be useful, |
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
# GNU General Public License for more details. |
|
# |
|
# You should have received a copy of the GNU General Public License |
|
# along with LON-CAPA; if not, write to the Free Software |
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
# |
|
# /home/httpd/html/adm/gpl.txt |
|
# |
|
# http://www.lon-capa.org/ |
|
# |
# 2/19 Guy |
# 2/19 Guy |
|
|
package Apache::inputtags; |
package Apache::inputtags; |
use strict; |
use strict; |
|
|
sub BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission')); |
&Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission')); |
} |
} |
|
|
|
|
Line 17 sub initialize_inputtags {
|
Line 42 sub initialize_inputtags {
|
@Apache::inputtags::inputlist=(); |
@Apache::inputtags::inputlist=(); |
# list of all current response ids |
# list of all current response ids |
@Apache::inputtags::response=(); |
@Apache::inputtags::response=(); |
#list of all response ids seen in this problem |
# list of all response ids seen in this problem |
@Apache::inputtags::responselist=(); |
@Apache::inputtags::responselist=(); |
|
# list of whether or not a specific response was previously used |
|
@Apache::inputtags::previous=(); |
# id of current part, 0 means that no part is current (inside <problem> only |
# id of current part, 0 means that no part is current (inside <problem> only |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |
# list of problem date statuses, the first element is for <problem> |
# list of problem date statuses, the first element is for <problem> |
#if there is a second element it is for the current <part> |
# if there is a second element it is for the current <part> |
@Apache::inputtags::status=(); |
@Apache::inputtags::status=(); |
#hash of defined params for the current response |
# hash of defined params for the current response |
%Apache::inputtags::params=(); |
%Apache::inputtags::params=(); |
|
# list of all ids, for <import>, these get join()ed and prepended |
|
@Apache::inputtags::import=(); |
} |
} |
|
|
sub start_input { |
sub start_input { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval); |
|
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::inputlist,$id); |
push (@Apache::inputtags::inputlist,$id); |
return $id; |
return $id; |
Line 41 sub end_input {
|
Line 71 sub end_input {
|
return ''; |
return ''; |
} |
} |
|
|
sub start_textarea { |
sub start_textfield { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
my $id = &start_input($parstack,$safeeval); |
my $id = &start_input($parstack,$safeeval); |
Line 51 sub start_textarea {
|
Line 81 sub start_textarea {
|
if ( $cols eq '') { $cols = 80; } |
if ( $cols eq '') { $cols = 80; } |
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
if ( $rows eq '') { $rows = 10; } |
if ( $rows eq '') { $rows = 10; } |
$result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '. |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
$result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '. |
|
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
|
} else { |
|
$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>'; |
|
} |
if ($oldresponse ne '') { |
if ($oldresponse ne '') { |
#get rid of any startup text if the user has already responded |
#get rid of any startup text if the user has already responded |
&Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]); |
&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
|
} |
|
} |
|
if ($target eq 'grade') { |
|
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
|
if ($seedtext eq $ENV{'form.HWVAL'.$Apache::inputtags::response[-1]}) { |
|
# if the seed text is still there it wasn't a real submission |
|
$ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}=''; |
} |
} |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub end_textarea { |
sub end_textfield { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { |
if ($target eq 'web') { |
return "</textarea>"; |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
} |
return "</textarea>"; |
|
} |
|
} |
&end_input; |
&end_input; |
return ''; |
return ''; |
} |
} |
Line 76 sub start_textline {
|
Line 119 sub start_textline {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
if ($size eq '') { $size=20; } |
if ($size eq '') { $size=20; } |
my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}; |
my $partid=$Apache::inputtags::part; |
$result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />'; |
my $id=$Apache::inputtags::response['-1']; |
} |
my $oldresponse = |
if ($target eq 'edit') { |
$Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
$result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token)); |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
$result= '<input type="text" name="HWVAL'.$id.'" value="'. |
|
$oldresponse.'" size="'.$size.'" />'; |
|
} else { |
|
$result='<i>'.$oldresponse.'</i>'; |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>"; |
$result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>"; |
$result.=&Apache::edit::end_table; |
$result.=&Apache::edit::end_table; |
} |
} elsif ($target eq 'modified') { |
if ($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'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
Line 98 sub end_textline {
|
Line 147 sub end_textline {
|
} |
} |
|
|
sub start_datasubmission { |
sub start_datasubmission { |
return ''; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
|
my $result; |
|
if ($target eq 'meta') { |
|
$result = &Apache::response::meta_stores_write($token->[2]->{'name'}, |
|
$token->[2]->{'type'}, |
|
$token->[2]->{'display'}); |
|
$result .= &Apache::response::meta_package_write('datasubmission'); |
|
} |
|
return $result; |
} |
} |
|
|
sub end_datasubmission { |
sub end_datasubmission { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ( $target == 'web' ) { |
my $result; |
return '<input type="submit" name="submit" value="Submit All Data" />'; |
if ( $target eq 'web' ) { |
|
} elsif ($target eq 'grade' ) { |
|
if ( defined $ENV{'form.submitted'}) { |
|
&Apache::response::setup_params('datasubmission'); |
|
my $partid = $Apache::inputtags::part; |
|
my $id = $Apache::inputtags::response['-1']; |
|
my $response = $ENV{'form.HWVAL'.$id}; |
|
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
|
if ( $response =~ /[^\s]/) { |
|
$Apache::lonhomework::results{"resource.$partid.$id.$name"}= |
|
$response; |
|
} |
|
} |
} |
} |
return ''; |
&Apache::response::end_response; |
|
return $result; |
} |
} |
|
|
sub finalizeawards { |
sub finalizeawards { |
Line 155 sub finalizeawards {
|
Line 226 sub finalizeawards {
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$solved)=@_; |
my ($award,$solved,$previous)=@_; |
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
if ($solved =~ /^correct/ || $award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
my $previousmsg; |
$message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt; |
|
|
if ($previous) { $previousmsg='You have entered that answer before'; } |
|
|
|
if ($solved =~ /^correct/) { |
|
$message = "<b>You are correct.</b> Your receipt is ". |
|
&Apache::lonnet::receipt; |
|
$button=0; |
|
$previousmsg=''; |
|
} elsif ($solved =~ /^excused/) { |
|
$message = "<b>You are excused from the problem.</b>"; |
$button=0; |
$button=0; |
|
$previousmsg=''; |
|
} elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
|
if ($solved =~ /^incorrect/ || $solved eq '') { |
|
$message = "Incorrect"; |
|
$button=1; |
|
} else { |
|
$message = "<b>You are correct.</b> Your receipt is ". |
|
&Apache::lonnet::receipt; |
|
$button=0; |
|
$previousmsg=''; |
|
} |
} elsif ($award eq 'NO_RESPONSE') { |
} elsif ($award eq 'NO_RESPONSE') { |
$message = ''; |
$message = ''; |
$button=1; |
$button=1; |
Line 195 sub decideoutput {
|
Line 286 sub decideoutput {
|
$message = "Unknown message: $award"; |
$message = "Unknown message: $award"; |
$button=1; |
$button=1; |
} |
} |
return ($button,$message); |
return ($button,$message,$previousmsg); |
} |
} |
|
|
sub setgradedata { |
sub setgradedata { |
my ($award,$id) = @_; |
my ($award,$id,$previously_used) = @_; |
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
# if the student already has it correct, don't modify the status |
$Apache::lonhomework::results{"resource.$id.tries"} = |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') { |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
return ''; |
'correct_by_student'; |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
/^correct/ ) { |
} elsif ( $award eq 'INCORRECT' ) { |
#handle assignment of tries and solved status |
$Apache::lonhomework::results{"resource.$id.tries"} = |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=''; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
} |
'incorrect_attempted'; |
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
} elsif ( $award eq 'SUBMITTED' ) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'correct_by_student'; |
'ungraded_attempted'; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
} else { |
} elsif ( $award eq 'INCORRECT' ) { |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
'incorrect_attempted'; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'incorrect_attempted'; |
|
} elsif ( $award eq 'SUBMITTED' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'ungraded_attempted'; |
|
} elsif ( $award eq 'NO_RESPONSE' ) { |
|
return ''; |
|
} else { |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'incorrect_attempted'; |
|
} |
|
|
|
# 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'; |
|
} elsif ( $previously_used eq 'PREVIOUSLY_LAST') { |
|
#delete all data as they student didn't do anything |
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
|
if ($key =~ /^resource\.$id\./) { |
|
&Apache::lonxml::debug("Removing $key"); |
|
delete($Apache::lonhomework::results{$key}); |
|
} |
|
} |
|
#and since they didn't do anything we were never here |
|
return ''; |
|
} else { |
|
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
|
} |
} |
} |
$Apache::lonhomework::results{"resource.$id.award"} = $award; |
$Apache::lonhomework::results{"resource.$id.award"} = $award; |
} |
} |
Line 226 sub setgradedata {
|
Line 349 sub setgradedata {
|
sub grade { |
sub grade { |
my ($target) = @_; |
my ($target) = @_; |
my $id = $Apache::inputtags::part; |
my $id = $Apache::inputtags::part; |
# my $result=''; |
|
my $response=''; |
my $response=''; |
if ( $target == 'web' ) { |
if ( defined $ENV{'form.submitted'}) { |
if ( defined $ENV{'form.submitted'}) { |
my @awards = (); |
my @awards = (); |
foreach $response (@Apache::inputtags::responselist) { |
&Apache::lonxml::debug("$#Apache::inputtags::responselist"); |
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); |
foreach $response (@Apache::inputtags::responselist) { |
my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; |
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); |
if ( $value ne '' ) { |
my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; |
&Apache::lonxml::debug("keeping $value from $response for $id"); |
if ( $value ne '' ) { |
push (@awards,$value); |
&Apache::lonxml::debug("keeping $value from $response for $id"); |
} else { |
push (@awards,$value); |
&Apache::lonxml::debug("skipping $value from $response for $id"); |
} else { |
} |
&Apache::lonxml::debug("skipping $value from $response for $id"); |
} |
|
my $finalaward = &finalizeawards(@awards); |
|
my $previously_used; |
|
if ( $#Apache::inputtags::previous eq $#awards ) { |
|
$previously_used = 'PREVIOUSLY_LAST'; |
|
foreach my $value (@Apache::inputtags::previous) { |
|
if ($value eq 'PREVIOUSLY_USED' ) { |
|
$previously_used = $value; |
|
last; |
} |
} |
} |
} |
my $finalaward = &finalizeawards(@awards); |
|
&Apache::lonxml::debug("final award $finalaward"); |
|
&setgradedata($finalaward,$id); |
|
} |
} |
|
&Apache::lonxml::debug("final award $finalaward, $previously_used"); |
|
&setgradedata($finalaward,$id,$previously_used); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 254 sub gradestatus {
|
Line 383 sub gradestatus {
|
my ($id) = @_; |
my ($id) = @_; |
my $showbutton = 1; |
my $showbutton = 1; |
my $message = ''; |
my $message = ''; |
|
my $latemessage = ''; |
my $trystr=''; |
my $trystr=''; |
my $button=''; |
my $button=''; |
|
my $previousmsg=''; |
|
|
my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
&Apache::lonxml::debug("gradestatus has :$status:"); |
&Apache::lonxml::debug("gradestatus has :$status:"); |
if ( $status ne 'CLOSED' ) { |
if ( $status ne 'CLOSED' ) { |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
|
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
&Apache::lonxml::debug("Found Award |$award|$solved|"); |
&Apache::lonxml::debug("Found Award |$award|$solved|"); |
if ( $award ne '' ) { |
if ( $award ne '' ) { |
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$message) = &decideoutput($award,$solved); |
($showbutton,$message,$previousmsg) = |
$message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>"; |
&decideoutput($award,$solved,$previous); |
|
$message="<td bgcolor=\"#aaffaa\">$message</td>"; |
|
if ($previousmsg) { |
|
$previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>"; |
|
} |
} |
} |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
Line 275 sub gradestatus {
|
Line 411 sub gradestatus {
|
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $showbutton ) { |
if ( $showbutton ) { |
$trystr = "<br />Tries $tries/$maxtries"; |
$trystr = "<td>Tries $tries/$maxtries</td>"; |
} |
} |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $showbutton ) { |
if ( $showbutton ) { |
$button = '<br /><input type="submit" name="submit" value="Submit All Answers" />'; |
$button = '<br /><input type="submit" name="submit" value="Submit Answer" />'; |
|
} |
|
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
|
#last submissions was after due date |
|
$latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>"; |
} |
} |
} |
} |
return $button.$message.$trystr; |
my $output= $previousmsg.$latemessage.$message.$trystr; |
|
if ($output =~ /^\s*$/) { |
|
return $button; |
|
} else { |
|
return $button.'<table><tr>'.$output.'</tr></table>'; |
|
} |
} |
} |
1; |
1; |
__END__ |
__END__ |