--- loncom/homework/structuretags.pm 2004/08/25 19:16:25 1.265
+++ loncom/homework/structuretags.pm 2004/09/18 17:29:29 1.268
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.265 2004/08/25 19:16:25 sakharuk Exp $
+# $Id: structuretags.pm,v 1.268 2004/09/18 17:29:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,7 +36,7 @@ use Apache::File();
use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
-
+use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
}
@@ -184,8 +184,16 @@ sub setup_rndseed {
return $rndseed;
}
+sub remember_problem_state {
+ return '
+
+
+ ';
+}
+
sub problem_edit_header {
- return '
+ return ''.
+ &Apache::structuretags::remember_problem_state().'
@@ -354,12 +362,13 @@ sub init_problem_globals {
if ($type eq 'problem') {
$Apache::inputtags::part='0';
@Apache::inputtags::partlist=('0');
-
- $Apache::lonhomework::problemstatus=&get_problem_status('0')
- } else {
+ $Apache::lonhomework::problemstatus=&get_problem_status('0');
+ $Apache::lonhomework::ignore_response_errors=0;
+ } elsif ($type eq 'library') {
$Apache::inputtags::part='';
@Apache::inputtags::partlist=();
$Apache::lonhomework::problemstatus='';
+ $Apache::lonhomework::ignore_response_errors=1;
}
@Apache::inputtags::responselist = ();
@Apache::inputtags::importlist = ();
@@ -395,12 +404,14 @@ sub set_problem_state {
sub get_problem_status {
my ($part)=@_;
- my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
- &Apache::lonxml::debug("problem status for $part is $problem_status");
- &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+ my $problem_status;
if ($ENV{'request.state'} eq 'construct' &&
defined($ENV{'form.problemstatus'})) {
$problem_status=$ENV{'form.problemstatus'};
+ } else {
+ $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+ &Apache::lonxml::debug("problem status for $part is $problem_status");
+ &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
}
return $problem_status;
}
@@ -484,7 +495,16 @@ sub start_problem {
''.
'
';
+ value="'.$ENV{'form.username'}.'" />';
+ if ($ENV{'user.adv'}) {
+ $form_tag_start.=
+ ' '.&mt(' Show All Foils');
+ }
+ $form_tag_start.='