--- loncom/homework/structuretags.pm 2004/05/27 04:25:13 1.250
+++ loncom/homework/structuretags.pm 2004/06/03 16:42:02 1.255
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.250 2004/05/27 04:25:13 albertel Exp $
+# $Id: structuretags.pm,v 1.255 2004/06/03 16:42:02 www 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;
@@ -84,7 +82,9 @@ 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();
+ @Apache::lonxml::htmlareafields=();
}
my $body_tag_start;
if (!defined($found{'body'})) {
@@ -201,7 +201,9 @@ sub problem_edit_header {
sub problem_edit_footer {
return '
- ';
+ '.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+ "\n\n\n";
}
sub option {
@@ -334,6 +336,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
@@ -458,7 +474,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();
@@ -478,6 +496,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')) {
@@ -487,13 +506,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.').'
';
- } else {
+ } elsif ($status ne 'NOT_YET_VIEWED') {
$msg.=''.&mt('Not open to be viewed').'
';
}
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.='The problem '.$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
$msg.=&checkout_msg;
+ } elsif ($status eq 'NOT_YET_VIEWED') {
+ $msg.=&firstaccess_msg($accessmsg,$symb);
}
$result.=$msg.'
';
} elsif ($target eq 'tex') {
@@ -603,7 +624,7 @@ sub end_problem {
}
} elsif ( ($target eq 'web' || $target eq 'tex') &&
$Apache::inputtags::part eq '0' &&
- $status ne 'UNCHECKEDOUT') {
+ $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') {
# if part is zero, no s existed, so we need show the current
# grading status
my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
@@ -615,7 +636,9 @@ sub end_problem {
) {
if ($target ne 'tex' &&
$ENV{'form.answer_output_mode'} ne 'tex') {
- $result.=" \n";
+ $result.="";
+ $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
+ $result.="\n";
}
if ($target eq 'web') {
$result.=&Apache::lonxml::xmlend();
@@ -983,12 +1006,13 @@ sub shuffle {
my $a=shift;
my $i;
if (defined(@$a)) {
- &Apache::response::setrandomnumber();
+ &Apache::response::pushrandomnumber();
for($i=@$a;--$i;) {
my $j=int(&Math::Random::random_uniform() * ($i+1));
next if $i == $j;
@$a[$i,$j] = @$a[$j,$i];
}
+ &Apache::response::poprandomnumber();
}
}
@@ -1036,6 +1060,7 @@ sub start_part {
}
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'NOT_YET_VIEWED') ||
( $status eq 'BANNED') ||
( $status eq 'UNAVAILABLE') ||
( $status eq 'INVALID_ACCESS')) {
@@ -1254,7 +1279,7 @@ sub end_startouttext {
&Apache::edit::end_row().
&Apache::edit::start_spanning_row()."\n"
. &Apache::loncommon::helpLatexCheatsheet () .
- &Apache::edit::editfield($token->[1],$text,"",80,4);
+ &Apache::edit::editfield($token->[1],$text,"",80,8,1);
}
if ($target eq 'modified') {
$result='