--- loncom/homework/structuretags.pm	2015/04/21 22:48:46	1.512.2.10
+++ loncom/homework/structuretags.pm	2014/12/15 18:44:20	1.526
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.10 2015/04/21 22:48:46 raeburn Exp $
+# $Id: structuretags.pm,v 1.526 2014/12/15 18:44:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -224,54 +224,9 @@ sub end_tex {
 }
 
 sub homework_js {
-    my ($postsubmit,$timeout);
-    if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
-        my $crstype;
-        if (&Apache::loncommon::course_type() eq 'Community') {
-            $crstype = 'community';
-        } else {
-            if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {
-                $crstype = 'official';
-            } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.textbook'}) {
-                $crstype = 'textbook';
-            } else {
-                $crstype = 'unofficial';
-            }
-        }
-        $postsubmit = $env{'course.'.$env{'request.course.id'}.'.internal.postsubmit'};
-        if ($postsubmit eq '') {
-            my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
-            $postsubmit = $domdefs{'postsubmit'};
-            unless ($postsubmit eq 'off') {
-                $timeout = $domdefs{$crstype.'postsubtimeout'};
-            }
-        } elsif ($postsubmit eq '0') {
-            $postsubmit = 'off';
-        } elsif ($postsubmit eq '1') {
-            $postsubmit = 'on';
-            $timeout = $env{'course.'.$env{'request.course.id'}.'.internal.postsubtimeout'};
-            if ($timeout eq '') {
-                my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
-                $timeout = $domdefs{$crstype.'postsubtimeout'};
-            }
-        }
-        if ($timeout eq '') {
-            $timeout = 60;
-        }
-    } else {
-        my %domdefs = &Apache::lonnet::get_domain_defaults($env{'request.role.domain'});
-        $postsubmit = $domdefs{'postsubmit'};
-        unless ($postsubmit eq 'off') {
-            $timeout = 60;
-        }
-    }
-    my $jstimeout = 0;
-    if ($timeout) {
-        $jstimeout = 1000 * $timeout;
-    }
     return &Apache::loncommon::resize_textarea_js().
            &setmode_javascript().
-	<<"JS";
+	<<'JS';
 <script type="text/javascript">
 // <![CDATA[
 function setSubmittedPart (part,prefix) {
@@ -286,17 +241,6 @@ function setSubmittedPart (part,prefix)
     }
 }
 
-function disableAutoComplete (id) {
-    var field = document.getElementById(id);
-    if (field != null && field != undefined){
-        if ('autocomplete' in field) {
-            field.autocomplete = "off";
-        } else {
-            field.setAttribute("autocomplete", "off");
-        }
-    }
-}
-
 function image_response_click (which, e) {
     init_geometry();
     if (!e) { e = window.event; } //IE
@@ -313,70 +257,50 @@ function image_response_click (which, e)
 
 var submithandled = 0;
 var keypresshandled = 0;
-var postsubmit = '$postsubmit';
 
-\$(document).ready(function(){
-  if (postsubmit != 'off') {
-    \$(document).keypress(function(event){
+$(document).ready(function(){
+
+    $(document).keypress(function(event){
         var keycode = (event.keyCode ? event.keyCode : event.which);
         if ((keycode == '13') && (keypresshandled == 0)) {
-            if ( \$( document.activeElement ).hasClass("LC_textline") ) {
+            if ( $( document.activeElement ).hasClass("LC_textline") ) {
                 keypresshandled = 1;
-                var idsArray = \$( document.activeElement ).attr("id").split(/HWVAL_/);
+                var idsArray = $( document.activeElement ).attr("id").split(/HWVAL_/);
                 if (idsArray.length) {
                     event.preventDefault();
                     var itemsArray = idsArray[1].split(/_/);
                     var buttonId = idsArray[0]+'submit_'+itemsArray[0];
-                    \$("#"+buttonId).trigger("click");
+                    $("#"+buttonId).trigger("click");
                 }
             }
         }
     });
 
-    \$(document).delegate('form :submit', 'click', function( event ) {
-        if ( \$( this ).hasClass( "LC_hwk_submit" ) ) {
+    $(document).delegate('form :submit', 'click', function( event ) {
+        if ( $( this ).hasClass( "LC_hwk_submit" ) ) {
             var buttonId = this.id;
-            var timeout = $jstimeout;
             if (submithandled == 0) {
                 submithandled = 1;
-                \$( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
+                $( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
                                            "color": "black","padding": "2px"}) ;
-                if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                if (( $(this.form).id == "LC_page" ) && ($('input[name="all_submit"]').length )) {
                     if (buttonId != "all_submit") {
-                        \$( ".LC_status_"+buttonId ).hide();
+                        $( ".LC_status_"+buttonId ).hide();
                         if (( "#"+buttonId+"_pressed" ).length) {
-                            \$( "#"+buttonId+"_pressed" ).val( "1" );
+                            $( "#"+buttonId+"_pressed" ).val( "1" );
                         }
                     }
                 } else {
-                    \$( ".LC_status_"+buttonId ).hide();
+                    $( ".LC_status_"+buttonId ).hide();
                 }
-                \$(this.form).submit();
-                \$( ".LC_hwk_submit" ).prop( "disabled", true);
-                \$( ".LC_textline" ).prop( "readonly", "readonly");
+                $(this.form).submit();
+                $( ".LC_hwk_submit" ).prop( "disabled", true);
+                $( ".LC_textline" ).prop( "readonly", "readonly");
                 event.preventDefault();
-
-                if (timeout > 0) {
-                    setTimeout(function(){
-                                       \$( "#msg_"+buttonId ).css({"display": "none"});
-                                       if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
-                                           if (buttonId != "all_submit") {
-                                               if (( "#"+buttonId+"_pressed" ).length) {
-                                                   \$( "#"+buttonId+"_pressed" ).val( "" );
-                                               }
-                                           }
-                                       }
-                                       \$( ".LC_hwk_submit" ).prop( "disabled", false);
-                                       \$( ".LC_textline" ).prop( "readonly", false);
-                                       submithandled = 0;
-                                       keypresshandled = 0;
-                                     }, timeout);
-                }
                 return true;
             }
         }
     });
-  }
 });
 
 // ]]>
@@ -422,7 +346,7 @@ sub page_start {
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
-    my ($needs_upload,$partlist);
+    my $needs_upload;
     my ($symb)= &Apache::lonnet::whichuser();
     my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
     if ($is_task) {
@@ -440,12 +364,6 @@ sub page_start {
                     unless ($is_page) {
                         $needs_upload = 1;
                     }
-                    if ((ref($tagstack) eq 'ARRAY') && ($tagstack->[-1] eq 'problem')) {
-                        my $res = $navmap->getBySymb($symb);
-                        if (ref($res)) {
-                            $partlist = $res->parts();
-                        }
-                    }
                 }
             }
         } else {
@@ -457,17 +375,10 @@ sub page_start {
                     if (ref($mapres)) {
                         $is_page = $mapres->is_page();
                     }
-                    if ($is_page) {
-                        if ((ref($tagstack) eq 'ARRAY') && ($tagstack->[-1] eq 'problem')) {
-                            my $res = $navmap->getBySymb($symb);
-                            if (ref($res)) {
-                                $partlist = $res->parts();
-                            }
-                        }
-                    } else {
+                    unless ($is_page) {
                         my $res = $navmap->getBySymb($symb);
                         if (ref($res)) {
-                            $partlist = $res->parts();
+                            my $partlist = $res->parts();
                             if (ref($partlist) eq 'ARRAY') {
                                 foreach my $part (@{$partlist}) {
                                     my @types = $res->responseType($part);
@@ -603,7 +514,7 @@ sub page_start {
 		"\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
 	}
     }
-    return ($page_start,$form_tag_start,$partlist);
+    return ($page_start,$form_tag_start);
 }
 
 #use Time::HiRes();
@@ -634,7 +545,7 @@ sub get_resource_name {
 }
 
 sub setup_rndseed {
-    my ($safeeval,$target,$probpartlist)=@_;
+    my ($safeeval,$target)=@_;
     my ($symb)=&Apache::lonnet::whichuser();
     my ($questiontype,$set_safespace,$rndseed);
     if ($target eq 'analyze') {
@@ -695,13 +606,7 @@ sub setup_rndseed {
         }
         unless (($target eq 'analyze') && (defined($rndseed))) {
             $rndseed=&Apache::lonnet::rndseed();
-            my $partfortries = $Apache::inputtags::part;
-            if (ref($probpartlist) eq 'ARRAY') {
-                if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) {
-                    $partfortries = $probpartlist->[0];
-                }
-            }
-            my $curr_try = $Apache::lonhomework::history{"resource.$partfortries.tries"};
+            my $curr_try = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
             if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                 $curr_try ++;
             }
@@ -709,7 +614,7 @@ sub setup_rndseed {
                 $rndseed = $1;
             }
             if ($curr_try) {
-                my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
+                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
                 if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
                     my $inc = int(($curr_try-1)/$reqtries);
                     $rndseed += $inc;
@@ -719,9 +624,6 @@ sub setup_rndseed {
             }
         }
         $set_safespace = 1;
-        if ($target eq 'grade') {
-            $Apache::lonhomework::rawrndseed = $rndseed;
-        }
     }
     if ($set_safespace) {
         if ($safeeval) {
@@ -862,7 +764,7 @@ sub problem_web_to_edit_header {
 ".&mt("Problem Type:")."
 <select name='problemtype'>
   <option value=''></option>
-  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('exam'   ,'problemtype').&mt("Bubblesheet Exam Problem")."</option>
   ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
   ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
@@ -982,7 +884,7 @@ sub initialize_storage {
 	}
 	%Apache::lonhomework::history=
 	    &Apache::lonnet::tmprestore($namespace,'',$domain,$name);
-	my ($temp)=keys(%Apache::lonhomework::history);
+	my ($temp)=keys(%Apache::lonhomework::history) ;
 	&Apache::lonxml::debug("Return message of $temp");
     } else {
 	%Apache::lonhomework::history=
@@ -1005,13 +907,13 @@ sub initialize_storage {
         &check_correctness_changes() is called in two circumstances
         in which the results hash is to be stored permanently, for
         grading triggered by a student's submission, where feedback on
-        correctness is to be provided to the student.
+        correctness is to be provided to the student. 
 
         1. Immediately prior to storing the results hash
 
-        To handle the case where a student's submission (and award) were
+        To handle the case where a student's submission (and award) were 
         stored after history was retrieved in &initialize_storage(), e.g.,
-        if a student submitted answers in quick succession (e.g., from
+        if a student submitted answers in quick succession (e.g., from 
         multiple tabs).  &Apache::inputtags::hidealldata() is called for
         any parts with out-of-order storage (i.e., correct then incorrect,
         where awarded >= 1 when correct).
@@ -1021,14 +923,14 @@ sub initialize_storage {
         To handle the case where lond on the student's homeserver returns
         delay:N -- where N is the number of transactions between the last
         retrieved in &initialize_storage() and the last stored immediately
-        before permanent storage of the current transaction via
-        lond::store_handler().  &Apache::grades::makehidden() is called
+        before permanent storage of the current transaction via 
+        lond::store_handler().  &Apache::grades::makehidden() is called  
         for any parts with out-of-order storage (i.e., correct then incorrect,
         where awarded >= 1 when correct).
 
 	Will call &store_aggregates() to increment totals for attempts, 
-	students, and corrects, if running user has student role.
-	
+        students, and corrects, if running user has student role.
+
 =cut
 
 
@@ -1149,13 +1051,13 @@ sub finalize_storage {
 =item check_correctness_changes()
 
         For all parts for which current results contain a solved status
-        of "incorrect_attempted", check if there was a transaction in which
-        solved was set to "correct_by_student" in the time since the last
-        transaction (retrieved when &initialize_storage() was called i.e.,
+        of "incorrect_attempted", check if there was a transaction in which  
+        solved was set to "correct_by_student" in the time since the last 
+        transaction (retrieved when &initialize_storage() was called i.e., 
         when &start_problem() was called), unless:
         (a) questiontype parameter is set to survey or anonymous survey (+/- credit)
         (b) problemstatus is set to no or no_feedback_ever
-        If such a transaction exists, and did not occur after "reset status"
+        If such a transaction exists, and did not occur after "reset status" 
         by a user with grading privileges, then the current transaction is an
         example of an out-of-order transaction (i.e., incorrect occurring after
         correct).  Accordingly, the current transaction should be hidden.
@@ -1283,8 +1185,8 @@ sub checkout_msg {
 		'resource'=>'The resource needs to be checked out',
 		'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
-                'checkout'=>'Check out Exam for Viewing',
-		'checkout?'=>'Check out Exam?');
+                'checkout'=>'Check out Bubblesheet Exam for Viewing',
+		'checkout?'=>'Check out Bubblesheet Exam?');
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
@@ -1361,7 +1263,6 @@ sub init_problem_globals {
     @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
-    $Apache::inputtags::leniency='';
     $Apache::structuretags::printanswer='No';
     @Apache::structuretags::whileconds=();
     @Apache::structuretags::whilebody=();
@@ -1377,11 +1278,8 @@ sub reset_problem_globals {
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
-    undef($Apache::inputtags::leniency);
     if ($type eq 'Task') {
         undef($Apache::inputtags::slot_name);
-    } elsif ($type eq 'problem') {
-        undef($Apache::lonhomework::rawrndseed);
     }
 #don't undef this, lonhomework.pm takes care of this, we use this to 
 #detect if we try to do 2 problems in one file
@@ -1483,7 +1381,7 @@ sub start_problem {
     my $resource_due;
 
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
+    my ($result,$form_tag_start,$slot_name,$slot);
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {
@@ -1499,18 +1397,9 @@ sub start_problem {
 
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
 	|| $target eq 'edit') {
-	($result,$form_tag_start,$probpartlist) =
+	($result,$form_tag_start) =
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
 			$name);
-    } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {
-        my ($symb)= &Apache::lonnet::whichuser();
-        my $navmap = Apache::lonnavmaps::navmap->new();
-        if (ref($navmap)) {
-            my $res = $navmap->getBySymb($symb);
-            if (ref($res)) {
-                $probpartlist = $res->parts();
-            }
-        }
     }
 
     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
@@ -1520,20 +1409,7 @@ sub start_problem {
 	$target eq 'tex') {
 
 	#handle rand seed in construction space
-	my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);
-        if (($target eq 'grade') && &Apache::response::submitted()) {
-            if ($Apache::lonhomework::type eq 'randomizetry') {
-                $Apache::lonhomework::results{'resource.0.rndseed'}=$rndseed;
-            } else {
-                my @parts;
-                if (ref($probpartlist) eq 'ARRAY') {
-                    @parts = @{$probpartlist};
-                }
-                unless (@parts) {
-                    $Apache::lonhomework::results{'resource.0.rndseed'}=$Apache::lonhomework::rawrndseed;
-                }
-            }
-        }
+	my $rndseed=&setup_rndseed($safeeval,$target);
 	my ($symb)=&Apache::lonnet::whichuser();
 
 	if ($env{'request.state'} ne "construct" && 
@@ -2581,7 +2457,6 @@ sub start_part {
     my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $Apache::inputtags::part=$id;
     push(@Apache::inputtags::partlist,$id);
-    $Apache::inputtags::leniency='';
     @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
@@ -2591,14 +2466,6 @@ sub start_part {
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $newtype=&Apache::lonnet::EXT("resource.$id.type");
     if ($newtype) { $Apache::lonhomework::type=$newtype; }
-    if ($Apache::lonhomework::type eq 'randomizetry') {
-        my $rndseed=&setup_rndseed($safeeval,$target);
-        if (($target eq 'grade') && &Apache::response::submitted()) {
-            $Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
-        }
-    } elsif (($target eq 'grade') && &Apache::response::submitted()) {
-        $Apache::lonhomework::results{"resource.$id.rndseed"}=$Apache::lonhomework::rawrndseed;
-    }
     my $in_order_show=&ordered_show_check();
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
@@ -2747,7 +2614,6 @@ sub end_part {
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';
-    $Apache::inputtags::leniency='';
     $Apache::lonhomework::type = $Apache::lonhomework::default_type;
     return $result;
 }
@@ -2855,7 +2721,7 @@ sub start_problemtype {
 					    ['hide','Hide']]
 					   ,$token);
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
-					     [ ['exam','Exam/Quiz Problem'],
+					     [ ['exam','Bubblesheet Exam/Quiz Problem'],
 					       ['survey','Survey'],
                                                ['surveycred','Survey (with credit)'],
                                                ['anonsurvey','Anonymous Survey'],