--- loncom/homework/structuretags.pm 2004/04/29 07:57:47 1.246
+++ loncom/homework/structuretags.pm 2004/06/29 22:32:12 1.258
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.246 2004/04/29 07:57:47 albertel Exp $
+# $Id: structuretags.pm,v 1.258 2004/06/29 22:32:12 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,9 +25,7 @@
#
# http://www.lon-capa.org/
#
-# 2/19 Guy
-# 6/26/2001 fixed extra web display at end of tags
-# 8/17,8/18,8/20 Gerd Kortemeyer
+###
package Apache::structuretags;
@@ -40,8 +38,7 @@ use Apache::lonlocal;
use Apache::lonxml;
BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
-'simpleeditbutton','definetag'));
+ &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
}
sub start_web {
@@ -85,7 +82,8 @@ sub page_start {
if (!defined($found{'html'})) {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,
$parstack,$parser,$safeeval);
- $head_tag_start='
'.&Apache::lonmenu::registerurl(undef,$target);
+ $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target).
+ &Apache::lonhtmlcommon::htmlareaheaders();
}
my $body_tag_start;
if (!defined($found{'body'})) {
@@ -153,7 +151,8 @@ sub setup_rndseed {
my ($safeeval)=@_;
my $rndseed;
my ($symb)=&Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq "construct" || $symb eq '') {
+ if ($ENV{'request.state'} eq "construct" || $symb eq '' ||
+ $Apache::lonhomework::history{'resource.CODE'}) {
$rndseed=$ENV{'form.rndseed'};
if (!$rndseed) {
$rndseed=$Apache::lonhomework::history{'rndseed'};
@@ -173,9 +172,12 @@ sub setup_rndseed {
if (defined($rndseed) && $rndseed ne int($rndseed)) {
$rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
}
+ if ($Apache::lonhomework::history{'resource.CODE'}) {
+ $rndseed=&Apache::lonnet::rndseed();
+ }
if ($safeeval) {
&Apache::lonxml::debug("Setting rndseed to $rndseed");
- &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+ &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
}
}
return $rndseed;
@@ -198,7 +200,9 @@ sub problem_edit_header {
sub problem_edit_footer {
return '
- ';
+ '.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+ "\n\n\n";
}
sub option {
@@ -331,6 +335,20 @@ sub checkout_msg {
ENDCHECKOUT
}
+sub firstaccess_msg {
+ my ($time,$symb)=@_;
+ my ($map)=&Apache::lonnet::decode_symb($symb);
+ my $foldertitle=&Apache::lonnet::gettitle($map);
+ &Apache::lonxml::debug("map is $map title is $foldertitle");
+ return (<The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".
+
+ENDCHECKOUT
+}
+
sub init_problem_globals {
my ($type)=@_;
#initialize globals
@@ -431,6 +449,7 @@ sub start_problem {
#added vars to the scripting enviroment
my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+ $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
&Apache::run::run($expression,$safeeval);
my $status;
my $accessmsg;
@@ -454,7 +473,9 @@ sub start_problem {
}
$body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
}
-
+ if ($ENV{'form.markaccess'}) {
+ &Apache::lonnet::set_first_access('map');
+ }
#handle rand seed in construction space
my $rndseed=&setup_rndseed($safeeval);
my ($symb)=&Apache::lonxml::whichuser();
@@ -474,6 +495,7 @@ sub start_problem {
&Apache::lonxml::debug("Got $status");
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'NOT_YET_VIEWED') ||
( $status eq 'BANNED') ||
( $status eq 'UNAVAILABLE') ||
( $status eq 'INVALID_ACCESS')) {
@@ -483,13 +505,15 @@ sub start_problem {
my $msg=$body_tag_start;
if ($status eq 'UNAVAILABLE') {
$msg.='
'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'