--- loncom/homework/response.pm 2001/08/20 23:31:07 1.45
+++ loncom/homework/response.pm 2002/01/07 18:03:03 1.55
@@ -1,6 +1,30 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
-
+#
+# $Id: response.pm,v 1.55 2002/01/07 18:03:03 albertel Exp $
+#
+# 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/
+#
# 11/23,11/24,11/28 Gerd Kortemeyer
# Guy Albertelli
# 08/04,08/07 Gerd Kortemeyer
@@ -9,13 +33,18 @@ package Apache::response;
use strict;
sub BEGIN {
- &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
+ &Apache::lonxml::register('Apache::response',('responseparam','parameter','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));
}
sub start_response {
my ($parstack,$safeeval)=@_;
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+ if ($#Apache::inputtags::import > -1) {
+ &Apache::lonxml::debug("Turning :$id: into");
+ $id = join('_',@Apache::inputtags::import).'_'.$id;
+ &Apache::lonxml::debug("New :$id:");
+ }
push (@Apache::inputtags::response,$id);
push (@Apache::inputtags::responselist,$id);
@Apache::inputtags::inputlist=();
@@ -44,7 +73,13 @@ sub end_hintresponse {
# used by response to set the non-safe space random number generator to something
# that is stable and unique based on the part number and response number
sub setrandomnumber {
- my $rndseed=&Apache::lonnet::rndseed();
+ my $rndseed;
+ if ($ENV{'request.state'} eq "construct") {
+ $rndseed=$ENV{'form.rndseed'};
+ if (!$rndseed) { $rndseed=time; }
+ } else {
+ $rndseed=&Apache::lonnet::rndseed();
+ }
&Apache::lonxml::debug("randseed $rndseed");
# $rndseed=unpack("%32i",$rndseed);
$rndseed=$rndseed
@@ -158,6 +193,17 @@ sub check_for_previous {
return %previous;
}
+sub handle_previous {
+ my ($previous,$ad)=@_;
+ if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) {
+ if ($$previous{'last'}) {
+ push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
+ } else {
+ push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+ }
+ }
+}
+
sub start_caparesponse {
require Apache::caparesponse;
import Apache::caparesponse;
@@ -173,6 +219,13 @@ sub start_stringresponse {
return &Apache::caparesponse::start_stringresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
}
+sub start_formularesponse {
+ require Apache::caparesponse;
+ import Apache::caparesponse;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ return &Apache::caparesponse::start_formularesponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+}
+
sub start_numericalresponse {
require Apache::caparesponse;
import Apache::caparesponse;
@@ -210,9 +263,9 @@ sub start_essayresponse {
}
sub view_or_modify {
- my ($symb,$courseid,$domain,$name) = &Apache::lonhomework::which_user();
+ my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
my $myself=0;
- if ( ($user eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) {
+ if ( ($name eq $ENV{'user.name'}) && ($domain eq $ENV{'user.domain'}) ) {
$myself=1;
}
my $vgr=&Apache::lonnet::allowed('vgr',$courseid);
@@ -244,7 +297,7 @@ sub end_dataresponse {
if ( $target eq 'web' ) {
} elsif ($target eq 'grade' ) {
if ( defined $ENV{'form.submitted'}) {
- my ($symb,$courseid,$domain,$name)=&Apache::lonhomework::which_user();
+ my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();
my $allowed=&Apache::lonnet::allowed('mgr',$courseid);
if ($allowed) {
&Apache::response::setup_params('datasubmission');
@@ -296,6 +349,12 @@ sub start_responseparam {
$result = &Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::handle_insert();
}
+ } elsif ($target eq 'grade') {
+ if ($ENV{'request.state'} eq 'construct') {
+ my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval);
+ $Apache::inputtags::params{$name}=$default;
+ }
}
return $result;
}
@@ -306,9 +365,20 @@ sub end_responseparam {
return '';
}
+sub start_parameter {
+ my $result = &start_responseparam(@_);
+ return $result;
+}
+
+sub end_parameter {
+ my $result = &end_responseparam(@_);
+ return $result;
+}
+
sub setup_params {
my ($tag) = @_;
+ if ($ENV{'request.state'} eq 'construct') { return; }
@Apache::inputtags::params=();
my %paramlist=();
foreach my $key (keys(%Apache::lonnet::packagetab)) {
@@ -336,6 +406,41 @@ sub setup_params {
}
}
+sub answer_header {
+ my ($type) = @_;
+ my $result;
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
+ $result = '<table border="1"><tr><th>Answer for Part:'.
+ $Apache::inputtags::part. '</th></tr><tr>'."\n";
+ } else {
+ $result = '<table border="1"><tr><td>Answer for Part:'.
+ $Apache::inputtags::part. '</td>'."\n";
+ }
+ return $result;
+}
+
+sub answer_part {
+ my ($type,$answer) = @_;
+ my $result;
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+ $result = '<td>'.$answer.'</td>';
+ } else {
+ $result = '<td>'.$answer.'</td>';
+ }
+ return $result;
+}
+
+sub answer_footer {
+ my ($type) = @_;
+ my $result;
+ if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
+ $result = '</tr></table>';
+ } else {
+ $result = '</tr></table>';
+ }
+ return $result;
+}
+
1;
__END__