--- loncom/homework/structuretags.pm 2003/02/14 21:22:04 1.148
+++ loncom/homework/structuretags.pm 2003/03/14 23:23:45 1.156
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.148 2003/02/14 21:22:04 www Exp $
+# $Id: structuretags.pm,v 1.156 2003/03/14 23:23:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -101,7 +101,7 @@ sub page_start {
$body_tag_start.='bgcolor="#ffffff"';
}
}
- $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target);
+ $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
my ($symb)=&Apache::lonxml::whichuser();
if ($symb eq '') {
@@ -241,6 +241,7 @@ ENDCHECKOUT
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ $Apache::lonhomework::parsing_a_problem=1;
# meta is called from lonpublisher, which doesn't uses the normal
# lonhomework method of parsing the file which means that inputtags
# won't get reset
@@ -253,6 +254,8 @@ sub start_problem {
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
@Apache::inputtags::previous=();
+ @Apache::inputtags::previous_version=();
+ $Apache::structuretags::printanswer='No';
if ($target ne 'analyze') {
&initialize_storage();
if ($target eq 'web') {
@@ -323,7 +326,7 @@ sub start_problem {
}
$result.=$msg.'
';
} elsif ($target eq 'tex') {
- $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm ";
+ $result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm';
if ($status eq 'UNAVAILABLE') {
$result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm ';
} else {
@@ -360,6 +363,15 @@ sub start_problem {
}
$Apache::lonhomework::name=$name;
my $id = $Apache::inputtags::part;
+ my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+ my $allkeys = &Apache::lonnet::metadata($ENV{'request.uri'},'keys');
+ my @allkeys = split /,/,$allkeys;
+ my $allow_print_points = 0;
+ foreach my $partial_key (@allkeys) {
+ if ($partial_key=~m/weight/) {
+ $allow_print_points++;
+ }
+ }
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
$duedate = POSIX::strftime("%c",localtime($duedate));
my $temp_file;
@@ -372,21 +384,24 @@ 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);
if ($due_file_content ne $duedate) {
$temp_file = Apache::File->new('>'.$filename);
print $temp_file "$duedate\n";
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- if(not $duedate=~m/1969/) {
- $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';
+ if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';
} else {
- $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+ if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
}
} else {
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource "'.$name_of_resourse.'"
located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';
+ if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
}
@@ -463,6 +478,12 @@ sub end_problem {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result = &problem_edit_footer();
}
+
+ undef(%Apache::lonhomework::history);
+ undef(%Apache::lonhomework::results);
+ undef($Apache::inputtags::part);
+ undef($Apache::lonhomework::parsing_a_problem);
+
return $result;
}
@@ -666,28 +687,36 @@ sub start_part {
$Apache::inputtags::part=$id;
@Apache::inputtags::responselist = ();
@Apache::inputtags::previous=();
+ @Apache::inputtags::previous_version=();
+ my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
- } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
- my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
- push (@Apache::inputtags::status,$status);
- my $expression='$external::datestatus="'.$status.'";';
- $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
- &Apache::run::run($expression,$safeeval);
- if ( $status eq 'CLOSED' ) {
- my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
- if ( $target eq "web" ) {
- $result="
Part is not open to be viewed. It $accessmsg
";
- } elsif ( $target eq 'tex' ) {
- $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
- }
- } else {
- if ($target eq 'tex') {
- if ($$tagstack[-2] ne 'problem') {
- $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
- }
+ } elsif ($target eq 'web' || $target eq 'grade' ||
+ $target eq 'answer' || $target eq 'tex') {
+ if ($hidden) {
+ my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+ } else {
+ my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
+ push (@Apache::inputtags::status,$status);
+ my $expression='$external::datestatus="'.$status.'";';
+ $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
+ &Apache::run::run($expression,$safeeval);
+ if ( $status eq 'CLOSED' ) {
+ my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+ if ( $target eq "web" ) {
+ $result="
Part is not open to be viewed. It $accessmsg
";
+ } elsif ( $target eq 'tex' ) {
+ $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
+ }
+ } else {
+ if ($target eq 'tex') {
+ $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+ if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+ }
+ }
}
- }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Part ID:','id',$token).
@@ -709,18 +738,20 @@ sub end_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
&Apache::lonxml::debug("in end_part $target ");
my $status=$Apache::inputtags::status['-1'];
+ my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
my $result='';
if ( $target eq 'meta' ) {
$result='';
- } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+ } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) {
$result=&Apache::inputtags::grade;
- } elsif ($target eq 'web' || $target eq 'tex' ) {
+ } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
$target);
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
$result=$gradestatus;
}
pop @Apache::inputtags::status;
+ $Apache::inputtags::part='';
return $result;
}
@@ -807,8 +838,15 @@ sub end_startouttext {
."
".
&Apache::edit::insertlist($target,$token).
- &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n".
- &Apache::edit::editfield($token->[1],$text,"",80,4);
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"
+ .'| '.
+ &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+ undef,undef,600)
+ .' | '.
+ &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+ undef,undef,600)
+ .' |
'.
+ &Apache::edit::editfield($token->[1],$text,"",80,4);
}
if ($target eq 'modified') {
$text=&Apache::lonxml::get_all_text("endouttext",$parser);
|