--- loncom/homework/inputtags.pm 2002/09/23 07:08:40 1.61
+++ loncom/homework/inputtags.pm 2002/11/19 14:59:35 1.74
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.61 2002/09/23 07:08:40 albertel Exp $
+# $Id: inputtags.pm,v 1.74 2002/11/19 14:59:35 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,7 +32,7 @@ use HTML::Entities();
use strict;
BEGIN {
- &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));
+ &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));
}
@@ -110,7 +110,7 @@ sub start_textfield {
$result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
$result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
- $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',50,2);
+ $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');
@@ -146,12 +146,17 @@ sub start_textline {
$Apache::lonxml::evaluate--;
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
- if ($size eq '') { $size=20; }
+ my $maxlength;
+ if ($size eq '') { $size=20; } else {
+ if ($size < 20) { $maxlength=$size; }
+ }
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
- $result= '';
+ if ($Apache::lonhomework::type ne 'exam') {
+ $result= '';
+ }
} else {
#right or wrong don't show what was last typed in.
#$result=''.$oldresponse.'';
@@ -164,6 +169,8 @@ sub start_textline {
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ } elsif ($target eq 'tex') {
+ $result='\framebox[1cm][s]{\hfill}';
}
return $result;
}
@@ -175,40 +182,6 @@ sub end_textline {
return "";
}
-sub start_datasubmission {
- 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 {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $result;
- 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;
- }
- }
- }
- &Apache::response::end_response;
- return $result;
-}
-
sub finalizeawards {
my $result='';
my $award;
@@ -268,7 +241,7 @@ sub finalizeawards {
}
sub decideoutput {
- my ($award,$solved,$previous)=@_;
+ my ($award,$solved,$previous,$target)=@_;
my $message='';
my $button=0;
my $previousmsg;
@@ -276,8 +249,13 @@ sub decideoutput {
if ($previous) { $previousmsg='You have entered that answer before'; }
if ($solved =~ /^correct/) {
- $message = "You are correct. Your receipt is ".
+ 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='';
} elsif ($solved =~ /^excused/) {
@@ -337,7 +315,8 @@ sub decideoutput {
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::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
return '';
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
@@ -382,7 +361,7 @@ sub setgradedata {
foreach my $key (keys(%Apache::lonhomework::results)) {
if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
&Apache::lonxml::debug("Removing $key");
- delete($Apache::lonhomework::results{$key});
+ delete($Apache::lonhomework::results{$key});
}
}
#and since they didn't do anything we were never here
@@ -424,7 +403,7 @@ sub grade {
}
sub gradestatus {
- my ($id) = @_;
+ my ($id,$target) = @_;
my $showbutton = 1;
my $message = '';
my $latemessage = '';
@@ -442,10 +421,14 @@ sub gradestatus {
if ( $award ne '' ) {
&Apache::lonxml::debug('Getting message');
($showbutton,$message,$previousmsg) =
- &decideoutput($award,$solved,$previous);
- $message="| $message | ";
- if ($previousmsg) {
- $previousmsg="$previousmsg | ";
+ &decideoutput($award,$solved,$previous,$target);
+ if ($target eq 'tex') {
+ $message=' '.$message.' ';
+ } else {
+ $message="$message | ";
+ if ($previousmsg) {
+ $previousmsg="$previousmsg | ";
+ }
}
}
my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
@@ -455,22 +438,38 @@ sub gradestatus {
if ( $maxtries eq '' ) { $maxtries = '2'; }
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }
if ( $showbutton ) {
- $trystr = "Tries $tries/$maxtries | ";
+ if ($target eq 'tex') {
+ if ($ENV{'request.state'} ne "construct") {
+ $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';
+ }
+ } else {
+ $trystr = "Tries $tries/$maxtries | ";
+ }
}
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
if ( $showbutton ) {
- $button = '
';
+ if ($target ne 'tex') {
+ $button = '
';
+ }
}
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
#last submissions was after due date
- $latemessage="The last submission was after the Due Date | ";
+ if ($target eq 'tex') {
+ $latemessage=' The last submission was after the Due Date ';
+ } else {
+ $latemessage="The last submission was after the Due Date | ";
+ }
}
}
my $output= $previousmsg.$latemessage.$message.$trystr;
if ($output =~ /^\s*$/) {
return $button;
} else {
- return $button.'';
+ if ($target eq 'tex') {
+ return $button.' \vskip 0 mm '.$output.' ';
+ } else {
+ return $button.'';
+ }
}
}
1;