--- loncom/homework/structuretags.pm 2003/11/21 20:21:20 1.226
+++ 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.226 2003/11/21 20:21:20 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;
@@ -37,10 +35,10 @@ use Apache::lonnet;
use Apache::File();
use Apache::lonmenu;
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 {
@@ -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'})) {
@@ -119,6 +119,7 @@ sub page_start {
$body_tag_start.=$help;
}
}
+ $body_tag_start.=&Apache::lonxml::message_location();
}
my $form_tag_start;
if (!defined($found{'form'})) {
@@ -151,14 +152,15 @@ 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'};
if (!$rndseed) {
$rndseed=time;
- $ENV{'form.rndseed'}=$rndseed;
}
+ $ENV{'form.rndseed'}=$rndseed;
}
if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
$ENV{'form.newrandomization'} eq &mt('New Randomization')) {
@@ -171,9 +173,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;
@@ -182,34 +187,82 @@ sub setup_rndseed {
sub problem_edit_header {
return '
-
-
-
-
-
- ';
+
+
+
+
+ '.
+ &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index',
+ 'Problem Editing Help').' | '.
+ &Apache::loncommon::help_open_faq(5).
+ &Apache::loncommon::help_open_bug('Authoring').' | '.
+ '';
}
sub problem_edit_footer {
return ' |
- ';
+ '.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+ "\n\n\n";
+}
+
+sub option {
+ my ($value,$name) = @_;
+ my $result ="
+ ".&option('CAN_ANSWER' ,'problemstate').&mt("Answerable")."
+ ".&option('CANNOT_ANSWER_tries' ,'problemstate').&mt("Open with full tries")."
+ ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."
+ ".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Answer")."
+
+
+
+Problem Type:
+
+
+
+Feedback Mode:
+
+
+
+ ";
my $numtoanalyze=$ENV{'form.numtoanalyze'};
if (!$numtoanalyze) { $numtoanalyze=20; }
$result.= '
+
+ENDCHECKOUT
+}
+
sub init_problem_globals {
my ($type)=@_;
#initialize globals
if ($type eq 'problem') {
$Apache::inputtags::part='0';
@Apache::inputtags::partlist=('0');
- $Apache::lonhomework::problemstatus=
- &Apache::lonnet::EXT('resource.0.problemstatus');
+
+ $Apache::lonhomework::problemstatus=&get_problem_status('0')
} else {
$Apache::inputtags::part='';
@Apache::inputtags::partlist=();
@@ -320,6 +387,26 @@ sub reset_problem_globals {
undef($Apache::lonhomework::name);
}
+sub set_problem_state {
+ my ($part)=@_;
+ if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+ $Apache::lonhomework::history{"resource.$part.solved"}=
+ 'correct_by_student';
+ }
+}
+
+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'});
+ if ($ENV{'request.state'} eq 'construct' &&
+ defined($ENV{'form.problemstatus'})) {
+ $problem_status=$ENV{'form.problemstatus'};
+ }
+ return $problem_status;
+}
+
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -337,13 +424,18 @@ sub start_problem {
$Apache::lonhomework::scantronmode=1;
}
+ &initialize_storage();
if ($target ne 'analyze') {
- &initialize_storage();
if ($target eq 'web') {
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
}
+ if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
- &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
+ if (($ENV{'request.state'} eq 'construct') &&
+ defined($ENV{'form.problemtype'})) {
+ $Apache::lonhomework::type=$ENV{'form.problemtype'};
+ }
+ &Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
}
if ($Apache::lonhomework::type eq '' ) {
my $uri=$ENV{'request.uri'};
@@ -358,6 +450,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;
@@ -381,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();
@@ -401,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')) {
@@ -409,14 +505,16 @@ sub start_problem {
$result.= $head_tag_start.'';
my $msg=$body_tag_start;
if ($status eq 'UNAVAILABLE') {
- $result.=''.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'';
- } else {
- $result.=''.&mt('Not open to be viewed').'';
+ $msg.=''.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'';
+ } 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') {
@@ -429,26 +527,19 @@ sub start_problem {
}
} elsif ($target eq 'web') {
my $name= &get_resource_name($parstack,$safeeval);
- if ($status eq 'CAN_ANSWER') {
- # create a page header and exit
- $result.="$head_tag_start$name
+ $result.="$head_tag_start$name
$body_tag_start \n $form_tag_start".
- '';
- if ($ENV{'request.state'} eq "construct") {
- $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
- }
- # if we are viewing someone else preserve that info
- if (defined $ENV{'form.grade_symb'}) {
- foreach my $field ('symb','courseid','domain','username') {
- $result .= ''."\n";
- }
+ '';
+ # create a page header and exit
+ if ($ENV{'request.state'} eq "construct") {
+ $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
+ }
+ # if we are viewing someone else preserve that info
+ if (defined $ENV{'form.grade_symb'}) {
+ foreach my $field ('symb','courseid','domain','username') {
+ $result .= ''."\n";
}
- } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
- || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE' ||
- $status eq 'INVALID_ACCESS') {
- $result.=$head_tag_start.
- "$name\n$body_tag_start\n";
}
} elsif ($target eq 'tex') {
my $startminipage = '';
@@ -461,7 +552,7 @@ sub start_problem {
my @packages = split /,/,$packages;
my $allow_print_points = 0;
foreach my $partial_key (@packages) {
- if ($partial_key=~m/part_0/) {
+ if ($partial_key=~m/^part_0$/) {
$allow_print_points=1;
}
}
@@ -477,7 +568,7 @@ sub start_problem {
my @due_file_content = <$temp_file>;
my $due_file_content = $due_file_content[$#due_file_content];
chomp $due_file_content;
- my $name_of_resourse= &get_resource_name($parstack,$safeeval);
+ my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval));
if ($due_file_content ne $duedate) {
$temp_file = Apache::File->new('>'.$filename);
print $temp_file "$duedate\n";
@@ -523,13 +614,17 @@ sub end_problem {
my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex') {
- if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
- $status eq 'CAN_ANSWER' ) {
+ if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
# if part is zero, no s existed, so we need to the grading
- &Apache::inputtags::grade;
+ if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
+ &Apache::inputtags::grade;
+ } else {
+ # move any submission data to .hidden
+ &Apache::inputtags::hidealldata($Apache::inputtags::part);
+ }
} 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);
@@ -539,17 +634,11 @@ sub end_problem {
(($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
($target eq 'answer') || ($target eq 'tex')
) {
- if ($status eq 'CAN_ANSWER') {
- if ($target ne 'tex' &&
- $ENV{'form.answer_output_mode'} ne 'tex') {
- $result.=" |