--- loncom/homework/structuretags.pm	2010/12/20 05:51:35	1.465.2.7
+++ loncom/homework/structuretags.pm	2011/01/13 18:11:45	1.485
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.465.2.7 2010/12/20 05:51:35 raeburn Exp $
+# $Id: structuretags.pm,v 1.485 2011/01/13 18:11:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,6 +128,7 @@ sub homework_js {
            &setmode_javascript().
 	<<'JS';
 <script type="text/javascript">
+// <![CDATA[
 function setSubmittedPart (part) {
    this.document.lonhomework.submitted.value="part_"+part;
 }
@@ -145,7 +146,7 @@ function image_response_click (which, e)
     input_element.value = click;
     img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
 }
-
+// ]]>
 </script>
 JS
 }
@@ -153,49 +154,55 @@ JS
 sub setmode_javascript {
     return <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function setmode(form,probmode) {
     form.problemmode.value = probmode;
     form.submit();
 }
+// ]]>
 </script>
 ENDSCRIPT
 }
 
 sub file_delchk_js {
-    my $delfilewarn = &mt('You have indicated you wish to delete some files previously included for submission.').'\\n'.
-                          &mt('Deleted files will not be graded.').' '.
-                          &mt('Submit Answer?');
+    my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
+                      &mt('Continue submission with these files removed?');
     return <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function file_deletion_check(formname) {
-    var str = new RegExp("^HWFILE.+_delete\$");
-    var delfilecount = 0;
     var elemnum = formname.elements.length;
     if (elemnum == 0) {
         return true;
     }
-    for (i=0; i<formname.elements.length; i++) {
+    var str = new RegExp("^HWFILE.+_delete\$");
+    var delboxes = new Array();
+    for (var i=0; i<formname.elements.length; i++) {
         var id = formname.elements[i].id;
         if (id != '') {
             if (str.test(id)) {
                 if (formname.elements[i].type == 'checkbox') {
                     if (formname.elements[i].checked) {
-                        delfilecount ++;
+                        delboxes.push(id);
                     }
                 }
             }
         }
     }
-    if (delfilecount > 0) {
+    if (delboxes.length > 0) {
         if (confirm("$delfilewarn")) {
             return true;
         } else {
+            for (var j=0; j<delboxes.length; j++) {
+                formname.elements[delboxes[j]].checked = false;
+            }
             return false;
         }
     } else {
         return true;
     }
 }
+// ]]>
 </script>
 ENDSCRIPT
 }
@@ -253,9 +260,6 @@ sub page_start {
     } elsif (!defined($found{'body'}) 
 	     && $env{'request.state'} eq 'construct') {
 	if ($target eq 'web' || $target eq 'edit') {
-	    if ($env{'environment.remote'} ne 'off') {
-		$body_args{'only_body'}  = 1;
-	    }
         # Breadcrumbs for Construction Space
         &Apache::lonhtmlcommon::clear_breadcrumbs();
         &Apache::lonhtmlcommon::add_breadcrumb({
@@ -289,8 +293,7 @@ sub page_start {
         # $body_args{'no_title'}       = 1;
         $body_args{'force_register'} = 1;
         $body_args{'add_entries'}    = \%add_entries;
-        if ($env{'environment.remote'} eq 'off'
-            && $env{'request.state'} eq   'construct') {
+        if ( $env{'request.state'} eq   'construct') {
             $body_args{'only_body'}  = 1;
         }
     }
@@ -391,7 +394,7 @@ sub setup_rndseed {
 	    }
 	    $env{'form.rndseed'}=$rndseed;
 	}
-        if (($env{'request.state'} eq "construct") &&
+        if (($env{'request.state'} eq "construct") && 
             ($Apache::lonhomework::type eq 'randomizetry')) {
             my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
             if ($tries) {
@@ -757,15 +760,15 @@ sub store_aggregates {
     foreach my $part (@parts) {
         if ($env{'request.role'} =~/^st/) {
             if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
-                eq 'APPROX_ANS' ||
-                $Apache::lonhomework::results{'resource.'.$part.'.award'}
-                eq 'EXACT_ANS') {
+	        eq 'APPROX_ANS' ||
+	        $Apache::lonhomework::results{'resource.'.$part.'.award'}
+	        eq 'EXACT_ANS') {
                 $aggregate{$symb."\0".$part."\0correct"} = 1;
             }
             if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
                 $aggregate{$symb."\0".$part."\0users"} = 1;
             } else {
-                my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]);
+                my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]); 
                 if ($last_reset) {
                     if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
                         $aggregate{$symb."\0".$part."\0users"} = 1;
@@ -774,7 +777,7 @@ sub store_aggregates {
             }
             $aggregate{$symb."\0".$part."\0attempts"} = 1;
         }
-        if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') ||
+        if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') || 
             ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred') ||
             ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry')) {
             if ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry') {
@@ -782,9 +785,8 @@ sub store_aggregates {
             } else {
                 $anoncounter{$symb."\0".$part} = 1;
             }
-            $anoncounter{$symb."\0".$part} = 1;
             my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
-            if ($needsrelease) {
+            if ($needsrelease) {   
                 my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
                 if ($curr_required eq '') {
                     &Apache::lonnet::update_released_required($needsrelease);
@@ -803,12 +805,12 @@ sub store_aggregates {
                             $cdomain,$cname);
     }
     if (keys(%anoncounter) > 0) {
-        &Apache::lonnet::cinc('nohist_anonsurveys',\%anoncounter,
-                            $cdomain,$cname);
+        &Apache::lonnet::cput('nohist_anonsurveys',\%anoncounter,
+                              $cdomain,$cname);
     }
     if (keys(%randtrycounter) > 0) {
-        &Apache::lonnet::cinc('nohist_randomizetry',\%randtrycounter,
-                            $cdomain,$cname);
+        &Apache::lonnet::cput('nohist_randomizetry',\%randtrycounter,
+                              $cdomain,$cname);
     }
 }
 
@@ -890,6 +892,7 @@ sub init_problem_globals {
 	&Apache::lonhomework::reset_show_problem_status();
 	$Apache::lonhomework::ignore_response_errors=1;
     }
+    @Apache::functionplotresponse::callscripts=();
     @Apache::inputtags::responselist = ();
     @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();
@@ -917,6 +920,7 @@ sub reset_problem_globals {
     undef($Apache::lonhomework::type);
     undef($Apache::lonhomework::scantronmode);
     undef($Apache::lonhomework::ignore_response_errors);
+    undef(@Apache::functionplotresponse::callscripts);
     &Apache::lonhomework::reset_show_problem_status();
 }
 
@@ -1020,17 +1024,6 @@ sub start_problem {
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex') {
-	#handle exam checkout
-	if ($Apache::lonhomework::type eq 'exam') {
-	    my $token=
-		$Apache::lonhomework::history{"resource.0.outtoken"};
-	    if (($env{'form.doescheckout'}) && (!$token)) {
-		$token=&Apache::lonxml::maketoken();
-		$Apache::lonhomework::history{"resource.0.outtoken"}=
-		    $token;
-	    }
-	    $result.=&Apache::lonxml::printtokenheader($target,$token);
-	}
 	if ($env{'form.markaccess'}) {
 	    my @interval=&Apache::lonnet::EXT("resource.0.interval");
 	    &Apache::lonnet::set_first_access($interval[1]);
@@ -1156,13 +1149,12 @@ sub start_problem {
 		    $result .= '<input type="hidden" name="grade_'.$field.
 			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
 		}
-                foreach my $field ('questiontype','rndseed') {
+                foreach my $field ('trial','questiontype') {
                     if ($env{"form.grade_$field"} ne '') {
                         $result .= '<input type="hidden" name="grade_'.$field.
                             '" value="'.$env{"form.grade_$field"}.'" />'."\n";
                     }
                 }
-
 	    }
 	} elsif ($target eq 'tex') {
 	    $result .= 'INSERTTEXFRONTMATTERHERE';
@@ -1335,6 +1327,9 @@ sub end_problem {
 		}
 	    }
 	}
+        if ($target eq 'web') {
+           $result.=&Apache::functionplotresponse::init_script();
+        }
 	if ($target eq 'grade') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &finalize_storage();
@@ -1836,6 +1831,7 @@ sub ordered_show_check {
     return $in_order_show;
 }
 
+
 sub start_startpartmarker {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
@@ -1844,7 +1840,7 @@ sub start_startpartmarker {
         $result.=&mt('Marker for the start of a part. Place end marker below to wrap in-between tags into a new part.').'</td></tr>';
         $result.=&Apache::edit::end_table();
 
-    }
+    } 
     return $result;
 }
 
@@ -1874,6 +1870,10 @@ sub end_endpartmarker {
     return @result;
 }
 
+
+
+
+
 sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if (!$Apache::lonxml::metamode) {
@@ -1964,7 +1964,7 @@ sub start_part {
 		    }
 		} elsif ($target eq 'web') {
                     if ($status eq 'CAN_ANSWER') {
-                        my $problemstatus = &get_problem_status($Apache::inputtags::part);
+                        my $problemstatus = &get_problem_status($Apache::inputtags::part); 
                         my $probrandomize = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].type");
                         my $probrandtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].randomizeontries");
                         my $num = scalar(@Apache::inputtags::partlist)-1;
@@ -1982,7 +1982,7 @@ sub start_part {
                             $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
                         }
                     }
-		    $result.='<a name="'.&escape($Apache::inputtags::part).'"></a>';
+		    $result.='<a name="'.&escape($Apache::inputtags::part).'" ></a>';
 		}
 	    }
 	}
@@ -2196,7 +2196,7 @@ sub end_startouttext {
                  .'</span></td>'
 	         .'<td align="left"><span id="math_'.$areaid.'" />'
 		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		 .'</td>'
+		 .'<span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'