--- loncom/homework/inputtags.pm 2002/09/23 07:08:40 1.61 +++ loncom/homework/inputtags.pm 2002/10/24 19:13:53 1.67 @@ -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.67 2002/10/24 19:13:53 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'); @@ -175,40 +175,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; @@ -382,7 +348,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 +390,7 @@ sub grade { } sub gradestatus { - my ($id) = @_; + my ($id,$target) = @_; my $showbutton = 1; my $message = ''; my $latemessage = ''; @@ -443,9 +409,13 @@ sub gradestatus { &Apache::lonxml::debug('Getting message'); ($showbutton,$message,$previousmsg) = &decideoutput($award,$solved,$previous); - $message="