--- loncom/homework/structuretags.pm	2008/07/28 05:26:00	1.425
+++ loncom/homework/structuretags.pm	2009/03/27 01:07:10	1.441
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.425 2008/07/28 05:26:00 raeburn Exp $
+# $Id: structuretags.pm,v 1.441 2009/03/27 01:07:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,29 @@
 #
 ###
 
+=pod
+
+=head1 NAME
+
+Apache::structuretags
+
+=head1 SYNOPSIS
+
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item 
+
+=back
+
+=cut
+
 
 package Apache::structuretags; 
 
@@ -36,6 +59,7 @@ use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
+use Apache::londefdef;
 use Apache::lonenc();
 use Time::HiRes qw( gettimeofday tv_interval );
 use lib '/home/httpd/lib/perl/';
@@ -74,7 +98,14 @@ sub start_tex {
     if ($target ne 'edit' && $target ne 'modified') {
 	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
 	if ($target eq 'tex') {
-	    return $bodytext.' ';
+	    
+	    # If inside a table, occurrences of \\ must be removed;
+	    # else the table blows up.
+
+	    if (&Apache::londefdef::is_inside_of($tagstack, "table")) {
+		$bodytext =~ s/\\\\//g;
+	    }
+	    return $bodytext.'{}';
 	}
     } elsif ($target eq "edit" ) {
 	my $bodytext = 
@@ -148,8 +179,10 @@ sub page_start {
 
     $extra_head .= &homework_js();
 
-    unless ($env{'environment.wysiwygeditor'} eq 'on') {
-        $extra_head .= &Apache::lonhtmlcommon::dragmath_js();
+    if ($env{'environment.wysiwygeditor'} eq 'on') {
+	$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");
+    } else {
+        $extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     }
 
     my %body_args;
@@ -390,8 +423,8 @@ sub problem_web_to_edit_header {
 	&mt(' Show All Instances')
 	: &mt(' Show All Foils');
 
-    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';
-    if (defined($env{'form.showallfoils'})) { $show_all.='checked="checked"'; }
+    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils"';
+    if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
     $show_all.= ' />'.$show_all_foils_text.'</label></span>';
 
 
@@ -416,8 +449,9 @@ sub problem_web_to_edit_header {
 <select name='problemtype'>
   <option value=''></option>
   ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
-  ".&option('problem','problemtype').&mt("Homework problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
+  ".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
 </select>
 </span>
 $show_all
@@ -540,12 +574,19 @@ sub initialize_storage {
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
 }
 
-# -------------------------------------------------------------finalize_storage
-# Stores away the result has to a student's environment
-# checks form.grade_ for specific values, other wises stores
-# to the running users environment
-# Will increment totals for attempts, students, and corrects
-# if running user has student role.  
+=pod
+
+=item finalize_storage()
+
+	Stores away the result has to a student's environment
+	checks form.grade_ for specific values, other wises stores
+	to the running users environment
+	Will increment totals for attempts, students, and corrects
+	if running user has student role.
+	
+=cut
+
+
 sub finalize_storage {
     my ($given_symb) = @_;
     my $result;
@@ -576,10 +617,16 @@ sub finalize_storage {
     return $result;
 }
 
-# -------------------------------------------------------------store_aggregates
-# Sends hash of values to be incremented in nohist_resourcetracker.db
-# for the course. Increments total number of attempts, unique students 
-# and corrects for each part for an instance of a problem, as appropriate.
+=pod
+
+item store_aggregates()
+
+	Sends hash of values to be incremented in nohist_resourcetracker.db
+	for the course. Increments total number of attempts, unique students 
+	and corrects for each part for an instance of a problem, as appropriate.
+	
+=cut
+
 sub store_aggregates {
     my ($symb,$courseid) = @_;
     my %aggregate;
@@ -857,16 +904,15 @@ sub start_problem {
 	    }
 	    if ($env{'request.role.adv'}) {
 		$form_tag_start.=
-		    ' <label><input type="checkbox" name="showallfoils" ';
+		    ' <label><input type="checkbox" name="showallfoils"';
 		if (defined($env{'form.showallfoils'})) {
-		    $form_tag_start.='checked="on"';
+		    $form_tag_start.=' checked="checked"';
 		}
 		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
 		    '</label>';
 	    }
             if ($Apache::lonhomework::type eq 'practice') {
-               $form_tag_start.='<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
-                                '<span class="LC_info">'.&mt('Submissions are not permanently recorded').'</span>';
+                $form_tag_start.=&practice_problem_header();
             }
 	    $form_tag_start.='<hr />';
 	}
@@ -893,6 +939,8 @@ sub start_problem {
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
 		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+                } elsif ($status eq 'NOT_IN_A_SLOT') {
+                    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
@@ -903,7 +951,7 @@ sub start_problem {
 		} elsif ($status eq 'NOT_YET_VIEWED') {
 		    $msg.=&firstaccess_msg($accessmsg,$symb);
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
-		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work.");
+		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
@@ -940,6 +988,11 @@ sub start_problem {
 	    # create a page header and exit
 	    if ($env{'request.state'} eq "construct") {
 		$result.= &problem_web_to_edit_header($env{'form.rndseed'});
+                if ($Apache::lonhomework::type eq 'practice') {
+                    $result.= '<input type="submit" name="resetdata" '.
+                              'value="'.&mt('New Problem Variation').'" />'.
+                              &practice_problem_header().'<hr />';
+                }
 	    }
 	    # if we are viewing someone else preserve that info
 	    if (defined $env{'form.grade_symb'}) {
@@ -1175,6 +1228,11 @@ sub start_library {
 	$result.=" \n $form_tag_start".	
 		  '<input type="hidden" name="submitted" value="yes" />';
 	$result.=&problem_web_to_edit_header($rndseed);
+        if ($Apache::lonhomework::type eq 'practice') {
+            $result.= '<input type="submit" name="resetdata" '.
+                      'value="'.&mt('New Problem Variation').'" />'.
+                      &practice_problem_header().'<hr />';
+        }
     }
     return $result;
 }
@@ -1275,7 +1333,7 @@ sub start_languageblock {
 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
-        my @preferred_languages=&Apache::loncommon::preferred_languages();
+        my @preferred_languages=&Apache::lonlocal::preferred_languages();
 # This should not even happen, since we should at least have the server language
         if (!$preferred_languages[0]) { $preferred_languages[0]='en'; }
 # Now loop over all languages in order of preference
@@ -1382,7 +1440,17 @@ sub end_languageblock {
 	    my $result = &Apache::lonxml::endredirection();
 	    my $which = &Apache::lonxml::get_param('which',$parstack,
 						   $safeeval);
-	    $available_texts{$which} = $result;
+            if ($which=~/\w/) {
+                $available_texts{$which} = $result;
+            }
+            my $otherlangs = &Apache::lonxml::get_param('other',$parstack,
+                                                        $safeeval);
+            foreach my $language (split(/\s*\,\s*/,$otherlangs)) {
+                if ($language=~/\w/) {
+                    $available_texts{$language} = $result;
+                }
+            }
+
 	}
 	return '';
     }
@@ -1479,7 +1547,7 @@ sub end_while {
 	    $return = &Apache::run::run($code,$safeeval);
 	}
 	if ($error) {
-	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running &lt;while&gt; on line').' '.$line.'</pre>');
+	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
 	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
@@ -1533,6 +1601,20 @@ sub start_randomlist {
 	    my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
 	    $showarg--;
 	    if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
+            if (($target eq 'analyze') && ($env{'form.check_parts_withrandomlist'})) {
+                my @currlist;
+                my $part = $Apache::inputtags::part;
+                if ($part ne '') {
+                    if (ref($Apache::lonhomework::analyze{'parts_withrandomlist'}) eq 'ARRAY') {
+                        my @currlist = @{$Apache::lonhomework::analyze{'parts_withrandomlist'}};
+                        if (!(grep(/^\Q$part\E$/,@currlist))) {
+                            push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
+                        }
+                    } else {
+                        push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
+                    }
+                }
+            }
 	    for(0 .. $show) {
 		$bodytext .= "$randomlist[ $idx_arr[$_] ]";
 	    }
@@ -1839,7 +1921,8 @@ sub start_problemtype {
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
 					     [ ['exam','Exam/Quiz Problem'],
 					       ['survey','Survey'],
-					       ['problem','Homework Problem'] ]
+					       ['problem','Homework Problem'],
+                                               ['practice','Practice Problem'] ]
 					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -1872,24 +1955,23 @@ sub end_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my $text='';
-
     if ($target eq 'edit') {
 	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
-	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
-<td>".&mt('Delete:').
-                 &Apache::edit::deletelist($target,$token)
-		 ."</td>
-<td>".
-                 &Apache::edit::insertlist($target,$token).
-		 '</td>';
+	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
+                 .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+                 .&Apache::edit::deletelist($target,$token)
+                 .'</span></td>';
         unless ($env{'environment.wysiwygeditor'} eq 'on') {
-            $result.='<td align="left">'
-                     .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-                     .'</td>';
-        }
+	    $result .= '<td align="left">'
+		.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
+		.'</td>'
+		.'<td>'
+		.&Apache::edit::insertlist($target,$token)
+		.'</td>';
+	}
 	$result.='<td align="right" valign="top">' .
-		 &Apache::loncommon::helpLatexCheatsheet().
+	    &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".
 		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
@@ -1963,5 +2045,17 @@ sub end_simpleeditbutton {
     return '';
 }
 
+sub practice_problem_header {
+    return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
+           '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
+           '</span>';
+}
+
 1;
 __END__
+
+=pod
+
+=back
+
+=cut