--- loncom/homework/structuretags.pm	2014/04/06 15:37:25	1.512.2.6
+++ loncom/homework/structuretags.pm	2015/04/10 12:01:28	1.534
@@ -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.6 2014/04/06 15:37:25 raeburn Exp $
+# $Id: structuretags.pm,v 1.534 2015/04/10 12:01:28 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -224,9 +224,55 @@ 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().
+                &Apache::loncommon::colorfuleditor_js().
            &setmode_javascript().
-	<<'JS';
+	<<"JS";
 <script type="text/javascript">
 // <![CDATA[
 function setSubmittedPart (part,prefix) {
@@ -241,6 +287,17 @@ 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
@@ -254,6 +311,75 @@ function image_response_click (which, e)
     input_element.value = click;
     img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
 }
+
+var submithandled = 0;
+var keypresshandled = 0;
+var postsubmit = '$postsubmit';
+
+\$(document).ready(function(){
+  if (postsubmit != 'off') {    
+    \$(document).keypress(function(event){
+        var keycode = (event.keyCode ? event.keyCode : event.which);
+        if ((keycode == '13') && (keypresshandled == 0)) {
+            if ( \$( document.activeElement ).hasClass("LC_textline") ) {
+                keypresshandled = 1;
+                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");
+                }
+            }
+        }
+    });
+
+    \$(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",
+                                           "color": "black","padding": "2px"}) ;
+                if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                    if (buttonId != "all_submit") {
+                        \$( ".LC_status_"+buttonId ).hide();
+                        if (( "#"+buttonId+"_pressed" ).length) {
+                            \$( "#"+buttonId+"_pressed" ).val( "1" );
+                        }
+                    }
+                } else {
+                    \$( ".LC_status_"+buttonId ).hide();
+                }
+                \$(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;
+            }
+        }
+    });
+  }
+});
+
 // ]]>
 </script>
 JS
@@ -297,7 +423,7 @@ sub page_start {
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
-    my $needs_upload;
+    my ($needs_upload,$partlist);
     my ($symb)= &Apache::lonnet::whichuser();
     my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
     if ($is_task) {
@@ -315,6 +441,12 @@ 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 {
@@ -326,10 +458,17 @@ sub page_start {
                     if (ref($mapres)) {
                         $is_page = $mapres->is_page();
                     }
-                    unless ($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 {
                         my $res = $navmap->getBySymb($symb);
                         if (ref($res)) {
-                            my $partlist = $res->parts();
+                            $partlist = $res->parts();
                             if (ref($partlist) eq 'ARRAY') {
                                 foreach my $part (@{$partlist}) {
                                     my @types = $res->responseType($part);
@@ -370,6 +509,9 @@ sub page_start {
 		"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
 		&Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";
+            if ($target eq 'edit') {
+                $extra_head .= &Apache::edit::js_update_linknum();
+            }
 	}
     }
 
@@ -414,6 +556,8 @@ sub page_start {
         $body_args{'add_entries'}    = \%add_entries;
         if ( $env{'request.state'} eq   'construct') {
             $body_args{'only_body'}  = 1;
+        } elsif ($target eq 'web') {
+            $body_args{'print_suppress'} = 1;
         }
     }
     $body_args{'no_auto_mt_title'} = 1;
@@ -460,7 +604,7 @@ sub page_start {
 		"\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
 	}
     }
-    return ($page_start,$form_tag_start);
+    return ($page_start,$form_tag_start,$partlist);
 }
 
 #use Time::HiRes();
@@ -491,7 +635,7 @@ sub get_resource_name {
 }
 
 sub setup_rndseed {
-    my ($safeeval,$target)=@_;
+    my ($safeeval,$target,$probpartlist)=@_;
     my ($symb)=&Apache::lonnet::whichuser();
     my ($questiontype,$set_safespace,$rndseed);
     if ($target eq 'analyze') {
@@ -552,7 +696,13 @@ sub setup_rndseed {
         }
         unless (($target eq 'analyze') && (defined($rndseed))) {
             $rndseed=&Apache::lonnet::rndseed();
-            my $curr_try = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
+            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"};
             if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                 $curr_try ++;
             }
@@ -560,7 +710,7 @@ sub setup_rndseed {
                 $rndseed = $1;
             }
             if ($curr_try) {
-                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
                 if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
                     my $inc = int(($curr_try-1)/$reqtries);
                     $rndseed += $inc;
@@ -570,6 +720,9 @@ sub setup_rndseed {
             }
         }
         $set_safespace = 1;
+        if ($target eq 'grade') {
+            $Apache::lonhomework::rawrndseed = $rndseed;
+        }
     }
     if ($set_safespace) {
         if ($safeeval) {
@@ -624,28 +777,260 @@ sub problem_edit_buttons {
    return $result;
 }
 
+sub insert_menu_datastructure {
+
+	my $template_menu = &template_dropdown_datastructure();
+	my $responseblock_menu = &responseblock_dropdown_datastructure();
+	my $conditional_scripting = &conditional_scripting_datastructure();
+	my $misc = &misc_datastructure();
+	
+	my @menu = ($template_menu, $responseblock_menu, $conditional_scripting, $misc);
+	return \@menu;
+
+}
+
+sub template_dropdown_datastructure {
+    # gathering the all templates and their path, title, category and help topic
+    my @templates = &Apache::lonhomework::get_template_list('problem');
+    # template category => title
+    my %tmplthash = ();
+    # template title => path
+    my %tmpltcontent = ();
+	
+    foreach my $template (@templates){
+        # put in hash if the template is not empty
+        unless ($template->[1] eq ''){
+            push(@{$tmplthash{$template->[2]}}, $template->[1]);
+            push(@{$tmpltcontent{$template->[1]}},$template->[0]);
+        }
+    }
+
+	my $catList = [];
+    foreach my $cat (sort keys %tmplthash) {
+		my $catItems = [];
+        foreach my $title (sort @{$tmplthash{$cat}}) {
+            my $path = $tmpltcontent{$title}->[0];
+            my $code;
+            open(FH, "<$path");
+            while(<FH>){
+                $code.= $_ unless $_ =~ /(<problem>)|(<\/problem>)/;
+            }
+            close(FH);
+
+			if ($code ne '') {				
+                my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')';
+				my $currItem = [$href, $title, undef];
+				push @{$catItems}, $currItem;
+			}
+        }
+		push @{$catList}, [$catItems, $cat, undef];
+    }
+
+	my $templDropdown = [$catList, &mt("Complete Problem Templates"), undef];
+    return $templDropdown;
+}
+
+sub responseblock_dropdown_datastructure {
+	
+	my $mathCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef]
+		], 
+		&mt("Math"), 
+		undef
+	];
+
+	my $miscCat = [		
+		[
+            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef],
+            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef],
+            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef],
+            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Response"), undef],
+            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N Statement"), undef],
+            ["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Optionresponse"), undef], 
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef]
+		],
+		&mt("Misc"),
+		undef
+	];
+
+	my $chemCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Structure"), undef]
+		],
+		&mt("Chemical"),
+		undef
+	];
+
+	my $textCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef]
+		],
+		&mt("Text"),
+		undef
+	];
+
+	my $cats = [[$mathCat, $miscCat, $chemCat, $textCat], &mt("Response Types"), undef];
+	return $cats;
+}
+
+
+sub conditional_scripting_datastructure {
+# TODO: corresponding routines should be used for the javascript:insertText parts
+# instead of the placeholder routine default_xml_tag with the tags
+# e.g. &default_xml_tag("postanswerdate") should be replaced with a routine which
+# returns the corresponding content for this case
+
+#TODO translated is currently temporarily here, another solution should be found where the
+# needed string can be retrieved
+
+	my $translatedTag = '
+<translated>
+    <lang which="en"></lang>
+    <lang which="default"></lang>
+</translated>';
+
+	my $cat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Tag"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef]
+		],
+		&mt("Contitional Scripting"),
+		undef
+	];
+
+	return $cat;
+}
+
+sub misc_datastructure {
+	
+	my $graphicalCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_img())) . "\')", &mt("Image"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::lonplot::insert_gnuplot())) . "\')", &mt("GNU Plot"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicstructure())) . "\')", &mt("Organic Structure"), undef]
+		],
+		"Graphical",
+		undef
+	];
+
+	my $advancedCat = [
+		[
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_script())) . "\')", &mt("Script Block"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("allow"))) . "\')", &mt("File Dependencies"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("import"))) . "\')", &mt("Import a File"), undef],
+			["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::londefdef::insert_meta())) . "\')", &mt("Custom Metadata"), undef]
+		],
+		"advanced",
+		undef
+	];
+	
+	my $cats = [[$graphicalCat, $advancedCat], &mt("misc"), undef];
+	return $cats;
+}
+
+# helper routine for the datastructure building subroutines
+sub default_xml_tag {
+	my ($tag) = @_;
+	return "\n<$tag></$tag>";
+}
+
+
+sub helpmenu_datastructure {
+
+	my $width = 500;
+	my $height = 600;
+
+	my $helpers = [
+		['Problem_LON-CAPA_Functions', &mt('Script Functions')],
+		['Greek_Symbols', &mt('Greek Symbols')],
+ 		['Other_Symbols', &mt('Other Symbols')],
+		['Authoring_Output_Tags', &mt('Output Tags')],
+		['Authoring_Multilingual_Problems', 
+			&mt('How to create problems in different languages')]
+	];
+
+	my $help_structure = [];
+
+	foreach my $count (0..(scalar(@{$helpers})-1)) {
+		my $filename = $helpers->[$count]->[0];
+		my $title = $helpers->[$count]->[1];
+		my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename.hlp',$width,$height,'yes');");
+		push @{$help_structure}, [$href, $title, undef];
+	}
+
+	return $help_structure;
+}
+
+# we need substitution to not break javascript code
+sub convert_for_js {
+    my $return = shift;
+        $return =~ s|script|ESCAPEDSCRIPT|g;
+        $return =~ s|\\|\\\\|g;
+        $return =~ s|\n|\\r\\n|g;
+        $return =~ s|'|\\'|g;
+		$return =~ s|&#39;|\\&#39;|g;
+    return $return;
+}
+
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" />'.
+    my ($mode)=@_;
+    my $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().'
-</div>
-'.
-       '<table id="LC_edit_problem_colorful" border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
+        <div class="LC_edit_problem_header">
+        <div class="LC_edit_problem_header_title">
+        '.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
+        </div><div class="LC_edit_actionbar" id="actionbar">'.
+        '<input type="hidden" name="problemmode" value="saveedit" />'.
+        &problem_edit_buttons();
+
+    $return.='<hr style="clear:both;visibility:hidden;" />
+    </div></div>'
+    .&Apache::lonxml::message_location();
+    $return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />
+    <script type="text/javascript" src="/adm/codemirror/codemirror-compressed-colorful.js"></script>';
+
+    $return .= '<script type="text/javascript" src="/adm/jQuery/addons/jquery-scrolltofixed.js"></script>
+        <script type="text/javascript">
+            // unless internet explorer
+            if (!(window.navigator.appName == "Microsoft Internet Explorer" && (document.documentMode || document.compatMode))){
+                $(document).ready(
+                    function() {
+                        $(\'.LC_edit_actionbar\').scrollToFixed(
+                            {
+                                fixed: function(){
+                                    $(this).find(\'.LC_edit_actionbar\').css(\'height\', \'31px\');
+                                }
+                            }
+                        );
+                    }
+                );
+            }
+        </script>
+        <table id="LC_edit_problem_colorful" border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
+    return $return;
 }
 
 sub problem_edit_footer {
+    my $resource = $env{'request.ambiguous'};
     return '</td></tr></table><br />
 <div class="LC_edit_problem_footer">
   <hr />'.
 &problem_edit_buttons().'
   <hr style="clear:both;" />
+  <script type="text/javascript">
+      restoreState("'.$resource.'");
+      restoreScrollPosition("'.$resource.'");
+  </script>
 </div>
 '.
     "\n</form>\n".&Apache::loncommon::end_page();
@@ -710,7 +1095,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>
@@ -830,7 +1215,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=
@@ -838,7 +1223,7 @@ sub initialize_storage {
     }
 
     #ignore error conditions
-    my ($temp)=keys %Apache::lonhomework::history ;
+    my ($temp)=keys(%Apache::lonhomework::history);
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
 }
 
@@ -846,12 +1231,37 @@ sub initialize_storage {
 
 =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.
-	
+	Stores away the result hash to a student's environment;
+	checks form.grade_ for specific values, otherwise stores
+	to the running user's environment.
+
+        &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. 
+
+        1. Immediately prior to storing the results hash
+
+        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 
+        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).
+
+        2. Immediately after storing the results hash
+
+        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  
+        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.
+
 =cut
 
 
@@ -872,8 +1282,92 @@ sub finalize_storage {
 					      $namespace,'',$domain,$name);
 	    &Apache::lonxml::debug('Construct Store return message:'.$result);
 	} else {
+            my ($laststore,$checkedparts,@parts,%postcorrect);
+            if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&
+                (!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) &&
+                (!defined($env{'form.grade_courseid'}))) {
+                if ($Apache::lonhomework::history{'version'}) {
+                    $laststore = $Apache::lonhomework::history{'version'}.'='.
+                                 $Apache::lonhomework::history{'timestamp'};
+                } else {
+                    $laststore = '0=0';
+                }
+                my %record = &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+                if ($record{'version'}) {
+                    my ($newversion,$oldversion,$oldtimestamp);
+                    if ($Apache::lonhomework::history{'version'}) {
+                        $oldversion = $Apache::lonhomework::history{'version'};
+                        $oldtimestamp = $Apache::lonhomework::history{'timestamp'};
+                    } else {
+                        $oldversion = 0;
+                        $oldtimestamp = 0;
+                    }
+                    if ($record{'version'} > $oldversion) {
+                        if ($record{'timestamp'} >= $oldtimestamp) {
+                            $laststore = $record{'version'}.'='.$record{'timestamp'};
+                            $newversion = $record{'version'} + 1;
+                            $checkedparts = 1;
+                            foreach my $key (keys(%Apache::lonhomework::results)) {
+                                if ($key =~ /^resource\.([^\.]+)\.solved$/) {
+                                    my $part = $1;
+                                    if ($Apache::lonhomework::results{$key} eq 'incorrect_attempted') {
+                                        push(@parts,$part);
+                                    }
+                                }
+                            }
+                            if (@parts) {
+                                my @parts_to_hide = &check_correctness_changes($symb,$courseid,$domain,$name,
+                                                                               \%record,\@parts,$newversion,
+                                                                               $oldversion);
+                                if (@parts_to_hide) {
+                                    foreach my $part (@parts_to_hide) {
+                                        $postcorrect{$part} = 1;
+                                        &Apache::inputtags::hidealldata($part);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
-					    $symb,$courseid,$domain,$name);
+					    $symb,$courseid,$domain,$name,$laststore);
+            if ($result =~ /^delay\:(\d+)$/) {
+                my $numtrans = $1;
+                my ($oldversion) = split(/=/,$laststore);
+                if ($numtrans) {
+                    my $newversion = $oldversion + 1 + $numtrans;
+                    my @possparts;
+                    if ($checkedparts) {
+                        foreach my $part (@parts) {
+                            unless ($postcorrect{$part}) {
+                                push(@possparts,$part);
+                            }
+                        }
+                    } else {
+                        foreach my $key (keys(%Apache::lonhomework::results)) {
+                            if ($key =~ /^resource\.([^\.]+)\.solved$/) {
+                                my $part = $1;
+                                unless ($postcorrect{$part}) {
+                                    if ($Apache::lonhomework::results{$key} eq 'incorrect_attempted') {
+                                        push(@possparts,$part);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (@possparts) {
+                        my %newrecord = &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+                        my @parts_to_hide = &check_correctness_changes($symb,$courseid,$domain,$name,
+                                                                       \%newrecord,\@possparts,$newversion,
+                                                                       $oldversion);
+                        if (@parts_to_hide) {
+                            my $partslist = join(',',@parts_to_hide);
+                            &Apache::grades::makehidden($newversion,$partslist,\%newrecord,$symb,$domain,$name,1);
+                        }
+                    }
+                }
+            }
 	    &Apache::lonxml::debug('Store return message:'.$result);
             &store_aggregates($symb,$courseid);
 	}
@@ -885,6 +1379,62 @@ sub finalize_storage {
 
 =pod
 
+=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., 
+        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" 
+        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.
+
+=cut
+
+
+sub check_correctness_changes {
+    my ($symb,$courseid,$domain,$name,$record,$parts,$newversion,$oldversion) = @_;
+    my @parts_to_hide;
+    unless ((ref($record) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
+        return @parts_to_hide;
+    }
+    if (@{$parts}) {
+        my $usec;
+        if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&
+            ($env{'request.course.id'} eq $courseid)) {
+            $usec = $env{'request.course.sec'};
+        } else {
+            $usec = &Apache::lonnet::getsection($domain,$name,$courseid);
+        }
+        foreach my $id (@{$parts}) {
+            next if (($Apache::lonhomework::results{'resource.'.$id.'.type'} =~ /survey/) ||
+                     (&Apache::lonnet::EXT("resource.$id.problemstatus",$symb,
+                                           $domain,$name,$usec,undef,$courseid) =~ /^no/));
+            my $reset;
+            for (my $i=$newversion-1; $i>=$oldversion; $i--) {
+                if (($record->{$i.':resource.'.$id.'.regrader'}) &&
+                    ($record->{$i.':resource.'.$id.'.tries'} eq '') &&
+                    ($record->{$i.':resource.'.$id.'.award'} eq '')) {
+                    $reset = 1;
+                } elsif (($record->{$i.":resource.$id.solved"} eq 'correct_by_student') &&
+                         ($record->{$i.":resource.$id.awarded"} >= 1)) {
+                    unless ($reset) {
+                        push(@parts_to_hide,$id);
+                        last;
+                    }
+                }
+            }
+        }
+    }
+    return @parts_to_hide;
+}
+
+=pod
+
 item store_aggregates()
 
 	Sends hash of values to be incremented in nohist_resourcetracker.db
@@ -947,7 +1497,7 @@ sub store_aggregates {
             }
         }
     }
-    if (keys (%aggregate) > 0) {
+    if (keys(%aggregate) > 0) {
 	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                             $cdomain,$cname);
     }
@@ -966,8 +1516,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>
@@ -1061,6 +1611,8 @@ sub reset_problem_globals {
     undef($Apache::inputtags::part);
     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
@@ -1162,13 +1714,13 @@ sub start_problem {
     my $resource_due;
 
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start,$slot_name,$slot);
+    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {
         if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            &Apache::lonnet::set_first_access($interval[1]);
+            &Apache::lonnet::set_first_access($interval[1],$interval[0]);
         }
 
         ($status,$accessmsg,$slot_name,$slot) =
@@ -1178,9 +1730,18 @@ sub start_problem {
 
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
 	|| $target eq 'edit') {
-	($result,$form_tag_start) =
+	($result,$form_tag_start,$probpartlist) =
 	    &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='';}
@@ -1190,7 +1751,20 @@ sub start_problem {
 	$target eq 'tex') {
 
 	#handle rand seed in construction space
-	my $rndseed=&setup_rndseed($safeeval,$target);
+	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 ($symb)=&Apache::lonnet::whichuser();
 
 	if ($env{'request.state'} ne "construct" && 
@@ -1398,7 +1972,7 @@ sub end_problem {
 	my $id = $Apache::inputtags::part;
 	my $weight = &Apache::lonnet::EXT("resource.$id.weight");
 	my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
-	my @packages = split /,/,$packages;
+	my @packages = split(/,/,$packages);
 	my $allow_print_points = 0;
 	foreach my $partial_key (@packages) {
 	    if ($partial_key=~m/^part_0$/) {
@@ -2132,8 +2706,8 @@ sub start_randomlist {
                     }
                 }
             }
-	    for(0 .. $show) {
-		$bodytext .= "$randomlist[ $idx_arr[$_] ]";
+	    for my $i (0 .. $show) {
+		$bodytext .= "$randomlist[ $idx_arr[$i] ]";
 	    }
 	    &Apache::lonxml::newparser($parser,\$bodytext);
 	}
@@ -2247,6 +2821,14 @@ 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.'\';';
@@ -2297,7 +2879,7 @@ sub start_part {
 		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
 		    my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
-		    my @allkeys = split /,/,$allkeys;
+		    my @allkeys = split(/,/,$allkeys);
 		    my $allow_print_points = 0;
 		    foreach my $partial_key (@allkeys) {
 			if ($partial_key=~m/^part_(.*)$/) {
@@ -2502,7 +3084,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'],
@@ -2545,7 +3127,8 @@ sub end_startouttext {
     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>"
+        $result.=&Apache::edit::start_table($token)."<tr><td>".&Apache::loncommon::insert_folding_button()
+                 ." ".&mt('Text Block')."</td>"
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'