--- loncom/homework/structuretags.pm	2011/01/07 05:14:57	1.465.2.12
+++ loncom/homework/structuretags.pm	2011/07/28 03:13:58	1.495
@@ -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.12 2011/01/07 05:14:57 raeburn Exp $
+# $Id: structuretags.pm,v 1.495 2011/07/28 03:13:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,8 +129,16 @@ sub homework_js {
 	<<'JS';
 <script type="text/javascript">
 // <![CDATA[
-function setSubmittedPart (part) {
-   this.document.lonhomework.submitted.value="part_"+part;
+function setSubmittedPart (part,prefix) {
+    if (typeof(prefix) == 'undefined') {
+        this.document.lonhomework.submitted.value="part_"+part;
+    } else {
+        for (var i=0;i<this.document.lonhomework.elements.length;i++) {
+            if (this.document.lonhomework.elements[i].name == prefix+'submitted') {
+                this.document.lonhomework.elements[i].value="part_"+part;
+            }
+        }
+    }
 }
 
 function image_response_click (which, e) {
@@ -144,7 +152,7 @@ function image_response_click (which, e)
     var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
     var click = x+':'+y;
     input_element.value = click;
-    img_element.src = '/adm/randomlabel.png?token='+token+'&amp;clickdata='+click;
+    img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
 }
 // ]]>
 </script>
@@ -154,52 +162,11 @@ 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 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 elemnum = formname.elements.length;
-    if (elemnum == 0) {
-        return true;
-    }
-    var str = new RegExp("^HWFILE.+_delete\$");
-    var delboxes = new Array();
-    for (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) {
-                        delboxes.push(id);
-                    }
-                }
-            }
-        }
-    }
-    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
@@ -230,8 +197,54 @@ sub page_start {
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
+    my $needs_upload;
+    my ($symb)= &Apache::lonnet::whichuser();
+    my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
     if ($is_task) {
-        $extra_head .= &file_delchk_js();
+        $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js();
+    } else {
+        if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.uploadedfiletypes") ne '') {
+            unless ($env{'request.state'} eq 'construct') {
+                my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    my $mapres = $navmap->getResourceByUrl($map);
+                    unless ($mapres->is_page()) {
+                        $needs_upload = 1;
+                    }
+                }
+            }
+        } else {
+            unless ($env{'request.state'} eq 'construct') {
+                my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    my $mapres = $navmap->getResourceByUrl($map);
+                    unless ($mapres->is_page()) {
+                        my $res = $navmap->getBySymb($symb);
+                        if (ref($res)) {
+                            my $partlist = $res->parts();
+                            if (ref($partlist) eq 'ARRAY') {
+                                foreach my $part (@{$partlist}) {
+                                    my @types = $res->responseType($part);
+                                    my @ids = $res->responseIds($part);
+                                    for (my $i=0; $i < scalar(@ids); $i++) {
+                                        if ($types[$i] eq 'essay') {
+                                            my $partid = $part.'_'.$ids[$i];
+                                            if (&Apache::lonnet::EXT("resource.$partid.uploadedfiletypes") ne '') {
+                                                $needs_upload = 1;
+                                                last;
+                                            }
+                                        }
+                                    }
+                                }
+                            } 
+                        }
+                    }
+                }
+            }
+        }
+        if ($needs_upload) {
+            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js();
+        }
     }
 
     my %body_args;
@@ -258,9 +271,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({
@@ -294,8 +304,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;
         }
     }
@@ -318,7 +327,6 @@ sub page_start {
     if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
 	$page_start .= &Apache::lonxml::message_location();
     }
-    
     my $form_tag_start;
     if (!defined($found{'form'})) {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
@@ -329,8 +337,11 @@ sub page_start {
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
 	}
-        if ($is_task) {
-            $form_tag_start .= ' onsubmit="return file_deletion_check(this);"';
+        my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
+        my ($path,$multiresp) = 
+            &Apache::loncommon::get_turnedin_filepath($symb,$uname,$udom);
+        if (($is_task) || ($needs_upload)) {
+            $form_tag_start .= ' onsubmit="return file_submission_check(this,'."'$path','$multiresp'".');"';
         }
 	$form_tag_start.='>'."\n";
 
@@ -396,7 +407,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) {
@@ -413,8 +424,14 @@ sub setup_rndseed {
 	    delete($env{'form.resetdata'});
 	    delete($env{'form.newrandomization'});
 	}
-	if (defined($rndseed) && $rndseed ne int($rndseed)) {
-	    $rndseed=join(':',&Apache::lonnet::digest($rndseed));
+        $rndseed=~s/\,/\:/g;
+        $rndseed=~s/[^\w\d\:\-]//g;
+	if (defined($rndseed)) {
+            my ($c1,$c2)=split(/\:/,$rndseed);
+            unless ($c2) { $c2=0; }
+            unless (($c1==int($c1)) && ($c2==int($c2))) {
+	       $rndseed=join(':',&Apache::lonnet::digest($rndseed));
+            }
         }
         if ($Apache::lonhomework::history{'resource.CODE'}) {
 	   $rndseed=&Apache::lonnet::rndseed();
@@ -466,27 +483,48 @@ sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }
 
+sub problem_edit_action_button {
+    my ($name,$action,$accesskey,$text,$flag)=@_;
+    my $actionscript="setmode(this.form,'$action')";
+    return "\n<input type='button' name='$name' accesskey='$accesskey' value='".&mt($text)."'".
+           ($flag?&Apache::edit::submit_ask_anyway($actionscript):&Apache::edit::submit_dont_ask($actionscript))." />";
+}
+
 sub problem_edit_buttons {
-   return  '
-<div class="LC_edit_problem_discards">
-       <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
-       ' onclick="javscript:setmode(this.form,'."'discard'".')"  />
-       <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" />
-       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
-</div>
-<div class="LC_edit_problem_saves">
-       <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />
-       <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
-</div>';
+   my ($mode)=@_;
+# Buttons that do not save
+   my $result='<div class="LC_edit_problem_discards">'.
+              &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
+   if ($mode eq 'editxml') {
+       $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
+       $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
+       $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+   } else {
+       $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
+       $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
+   }
+   $result.="\n</div>";
+# Buttons that save
+   $result.='<div class="LC_edit_problem_saves">';
+   if ($mode eq 'editxml') {
+       $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
+       $result.=&problem_edit_action_button('subsaveview','saveviewxml','v','Save and View');
+   } else {
+       $result.=&problem_edit_action_button('subsaveedit','saveedit','s','Save and Edit');
+       $result.=&problem_edit_action_button('subsaveview','saveview','v','Save and View');
+   }
+   $result.="\n</div>\n";
+   return $result;
 }
 
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
-	&Apache::structuretags::remember_problem_state().'
+    return '<input type="hidden" name="submitted" value="edit" />'.
+	&remember_problem_state('edit').'
 <div class="LC_edit_problem_header">
 <div class="LC_edit_problem_header_title">
 '.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
 </div>'.
+'<input type="hidden" name="problemmode" value="saveedit" />'.
 &problem_edit_buttons().'
 <hr style="clear:both;" />
 '.&Apache::lonxml::message_location().'
@@ -623,7 +661,7 @@ $show_all
    <div class="LC_edit_problem_header_randomize_row">
      <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
      <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
-     <input type="text" name="rndseed" size="10" value="'.
+     <input type="text" name="rndseed" size="24" value="'.
 	       $rndseed.'"
              onchange="javascript:document.lonhomework.changerandseed.click()" />';
 
@@ -762,15 +800,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;
@@ -779,7 +817,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') {
@@ -788,7 +826,7 @@ sub store_aggregates {
                 $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);
@@ -1026,17 +1064,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]);
@@ -1162,14 +1189,16 @@ 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";
                     }
                 }
-
 	    }
+            if ($env{'form.grade_imsexport'}) {
+                $result = '';
+            }
 	} elsif ($target eq 'tex') {
 	    $result .= 'INSERTTEXFRONTMATTERHERE';
 
@@ -1274,7 +1303,7 @@ sub end_problem {
 		} else {
 		    $frontmatter.= $begin_doc.$toc_line;
 		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { 
-			$frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+			$frontmatter .= '\fbox{\textit{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
 		    }
 		}
 	    } else {
@@ -1284,7 +1313,7 @@ sub end_problem {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		$frontmatter .= $begin_doc.$toc_line;
 		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { 
-		    $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+		    $frontmatter .= '\fbox{\textit{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
 		}
 	    } else {
 		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
@@ -1308,7 +1337,8 @@ sub end_problem {
 	    }
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
 		  $Apache::inputtags::part eq '0' &&
-		  $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') {
+		  $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED'
+                  && !$env{'form.grade_imsexport'}) {
 	    # if part is zero, no <part>s existed, so we need show the current
 	    # grading status
 	    my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
@@ -1318,8 +1348,9 @@ sub end_problem {
 	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
-	    if ($target ne 'tex' &&
-		$env{'form.answer_output_mode'} ne 'tex') {
+	    if (($target ne 'tex') &&
+		($env{'form.answer_output_mode'} ne 'tex') && 
+                (!$env{'form.grade_imsexport'})) {
 		$result.="</form>";
 	    }
 	    if ($target eq 'web') {
@@ -1845,6 +1876,7 @@ sub ordered_show_check {
     return $in_order_show;
 }
 
+
 sub start_startpartmarker {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
@@ -1853,7 +1885,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;
 }
 
@@ -1883,6 +1915,10 @@ sub end_endpartmarker {
     return @result;
 }
 
+
+
+
+
 sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if (!$Apache::lonxml::metamode) {
@@ -1968,12 +2004,12 @@ sub start_part {
 			$allow_print_points=0;
 		    }
 		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { 
-			$result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
+			$result .= '\vskip 10mm\fbox{\textit{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
 
 		    }
 		} 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;
@@ -1991,7 +2027,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>';
 		}
 	    }
 	}
@@ -2037,7 +2073,8 @@ sub end_part {
 	     !$hidden && $in_order_show) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
 							$target);
-	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
+	if (($Apache::lonhomework::type eq 'exam' && $target eq 'tex') ||
+             ($env{'form.grade_imsexport'})) {
 	    $gradestatus='';
 	}
 	$result.=$gradestatus;
@@ -2205,7 +2242,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>'
@@ -2278,11 +2315,12 @@ sub start_simpleeditbutton {
 #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
 #              .&Apache::loncommon::help_open_topic('Caching')
 #              .'</p>';
-        $result.=&Apache::lonhtmlcommon::start_funclist()
+        $result.=&Apache::loncommon::head_subbox(
+                 &Apache::lonhtmlcommon::start_funclist()
                 .&Apache::lonhtmlcommon::add_item_funclist(
                      '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
                     .&mt('Edit').'</a>')
-                .&Apache::lonhtmlcommon::end_funclist();
+                .&Apache::lonhtmlcommon::end_funclist());
 
     }
     return $result;