Diff for /loncom/homework/structuretags.pm between versions 1.512.2.23.2.1 and 1.529

version 1.512.2.23.2.1, 2020/01/15 13:57:36 version 1.529, 2015/02/22 15:23:57
Line 224  sub end_tex { Line 224  sub end_tex {
 }  }
   
 sub homework_js {  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().      return &Apache::loncommon::resize_textarea_js().
            &Apache::loncommon::colorfuleditor_js().                  &Apache::loncommon::colorfuleditor_js().
            &setmode_javascript().             &setmode_javascript().
  <<"JS";   <<'JS';
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 function setSubmittedPart (part,prefix) {  function setSubmittedPart (part,prefix) {
Line 287  function setSubmittedPart (part,prefix) Line 242  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) {  function image_response_click (which, e) {
     init_geometry();      init_geometry();
     if (!e) { e = window.event; } //IE      if (!e) { e = window.event; } //IE
Line 314  function image_response_click (which, e) Line 258  function image_response_click (which, e)
   
 var submithandled = 0;  var submithandled = 0;
 var keypresshandled = 0;  var keypresshandled = 0;
 var postsubmit = '$postsubmit';  
   
 \$(document).ready(function(){  $(document).ready(function(){
   if (postsubmit != 'off') {  
     \$(document).keypress(function(event){      $(document).keypress(function(event){
         var keycode = (event.keyCode ? event.keyCode : event.which);          var keycode = (event.keyCode ? event.keyCode : event.which);
         if ((keycode == '13') && (keypresshandled == 0)) {          if ((keycode == '13') && (keypresshandled == 0)) {
             if ( \$( document.activeElement ).hasClass("LC_textline") ) {              if ( $( document.activeElement ).hasClass("LC_textline") ) {
                 keypresshandled = 1;                  keypresshandled = 1;
                 var idsArray = \$( document.activeElement ).attr("id").split(/HWVAL_/);                  var idsArray = $( document.activeElement ).attr("id").split(/HWVAL_/);
                 if (idsArray.length) {                  if (idsArray.length) {
                     event.preventDefault();                      event.preventDefault();
                     var itemsArray = idsArray[1].split(/_/);                      var itemsArray = idsArray[1].split(/_/);
                     var buttonId = idsArray[0]+'submit_'+itemsArray[0];                      var buttonId = idsArray[0]+'submit_'+itemsArray[0];
                     \$("#"+buttonId).trigger("click");                      $("#"+buttonId).trigger("click");
                 }                  }
             }              }
         }          }
     });      });
   
     \$(document).delegate('form :submit', 'click', function( event ) {      $(document).delegate('form :submit', 'click', function( event ) {
         if ( \$( this ).hasClass( "LC_hwk_submit" ) ) {          if ( $( this ).hasClass( "LC_hwk_submit" ) ) {
             var buttonId = this.id;              var buttonId = this.id;
             var timeout = $jstimeout;  
             if (submithandled == 0) {              if (submithandled == 0) {
                 submithandled = 1;                  submithandled = 1;
                 \$( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",                  $( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
                                            "color": "black","padding": "2px"}) ;                                             "color": "black","padding": "2px"}) ;
                 if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {                  if (( $(this.form).id == "LC_page" ) && ($('input[name="all_submit"]').length )) {
                     if (buttonId != "all_submit") {                      if (buttonId != "all_submit") {
                         \$( ".LC_status_"+buttonId ).hide();                          $( ".LC_status_"+buttonId ).hide();
                     }                          if (( "#"+buttonId+"_pressed" ).length) {
                     if (( "#"+buttonId+"_pressed" ).length) {                              $( "#"+buttonId+"_pressed" ).val( "1" );
                         \$( "#"+buttonId+"_pressed" ).val( "1" );                          }
                     }                      }
                 } else {                  } else {
                     \$( ".LC_status_"+buttonId ).hide();                      $( ".LC_status_"+buttonId ).hide();
                 }                  }
                 \$(this.form).submit();                  $(this.form).submit();
                 \$( ".LC_hwk_submit" ).prop( "disabled", true);                  $( ".LC_hwk_submit" ).prop( "disabled", true);
                 \$( ".LC_textline" ).prop( "readonly", "readonly");                  $( ".LC_textline" ).prop( "readonly", "readonly");
                 event.preventDefault();                  event.preventDefault();
   
                 if (timeout > 0) {  
                     setTimeout(function(){  
                                        \$( "#msg_"+buttonId ).css({"display": "none"});  
                                        if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {  
                                            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;                  return true;
             }              }
         }          }
     });      });
   }  
 });  });
   
 // ]]>  // ]]>
Line 388  sub setmode_javascript { Line 314  sub setmode_javascript {
 <script type="text/javascript">  <script type="text/javascript">
 // <![CDATA[  // <![CDATA[
 function setmode(form,probmode) {  function setmode(form,probmode) {
     var initial = form.problemmode.value;  
     form.problemmode.value = probmode;      form.problemmode.value = probmode;
     form.submit();      form.submit();
     form.problemmode.value = initial;  
 }  }
 // ]]>  // ]]>
 </script>  </script>
Line 417  sub page_start { Line 341  sub page_start {
     $extra_head .= &homework_js().      $extra_head .= &homework_js().
                    &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");                     &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {      if (&Apache::lonhtmlcommon::htmlareabrowser()) {
         my %textarea_args;          my %textarea_args = (
         if (($env{'request.state'} ne 'construct') ||  
             ($env{'environment.nocodemirror'})) {  
             %textarea_args = (  
                                 dragmath => 'math',                                  dragmath => 'math',
                               );                                );
         }  
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);          $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }      }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);      my $is_task = ($env{'request.uri'} =~ /\.task$/);
Line 494  sub page_start { Line 414  sub page_start {
             }              }
         }          }
         if ($needs_upload) {          if ($needs_upload) {
             $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js().              $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js();
                            '<script type="text/javascript" '.  
                            'src="/res/adm/includes/file_upload.js"></script>';  
         }          }
     }      }
   
Line 643  sub get_resource_name { Line 561  sub get_resource_name {
 sub setup_rndseed {  sub setup_rndseed {
     my ($safeeval,$target,$probpartlist)=@_;      my ($safeeval,$target,$probpartlist)=@_;
     my ($symb)=&Apache::lonnet::whichuser();      my ($symb)=&Apache::lonnet::whichuser();
     my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries);      my ($questiontype,$set_safespace,$rndseed);
     if ($target eq 'analyze') {      if ($target eq 'analyze') {
         $questiontype = $env{'form.grade_questiontype'};          $questiontype = $env{'form.grade_questiontype'};
     }      }
     unless (defined($questiontype)) {      unless (defined($questiontype)) {
         $questiontype = $Apache::lonhomework::type;          $questiontype = $Apache::lonhomework::type;
     }      }
     if ($Apache::lonhomework::type eq 'randomizetry') {      if ($env{'request.state'} eq "construct" 
         my $partfortries = $Apache::inputtags::part;   || $symb eq '' 
 #   || $Apache::lonhomework::type eq 'practice'
 # Where question type is "randomizetry" for a problem containing   || $Apache::lonhomework::history{'resource.CODE'}) {
 # a single part (and unless type is explicitly set to not be  
 # "randomizetry" for that part), the number of tries used to  
 # determine randomization will be for that part, and randomization  
 # from calls to &random() in a perl script block before the part tag,  
 # will change based on the number of tries, and value of the  
 # "randomizeontries" parameter in effect for the single part.  
 #  
         if (ref($probpartlist) eq 'ARRAY') {  
             if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $partfortries)) {  
                 if (&Apache::lonnet::EXT('resource.'.$probpartlist->[0].'.type') eq 'randomizetry') {  
                     $partfortries = $probpartlist->[0];  
                 } else {  
                     $partfortries = '';  
                 }  
             }  
         }  
         if ($partfortries ne '') {  
             $numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"};  
             $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");  
         }  
     }  
     if (($env{'request.state'} eq "construct")   
         || ($symb eq '')  
         || ($Apache::lonhomework::type eq 'practice')  
         || ($Apache::lonhomework::history{'resource.CODE'})   
         || (($env{'form.code_for_randomlist'}) && ($target eq 'analyze'))) {  
  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  ['rndseed']);   ['rndseed']);
  $rndseed=$env{'form.rndseed'};   $rndseed=$env{'form.rndseed'};
Line 688  sub setup_rndseed { Line 580  sub setup_rndseed {
     if (!$rndseed) {      if (!$rndseed) {
  $rndseed=time;   $rndseed=time;
     }      }
             unless ($env{'form.code_for_randomlist'}) {      $env{'form.rndseed'}=$rndseed;
                 $env{'form.rndseed'}=$rndseed;  
             }  
  }   }
         if ((($env{'request.state'} eq "construct") || ($symb eq '')) &&          if (($env{'request.state'} eq "construct") && 
             ($Apache::lonhomework::type eq 'randomizetry')) {              ($Apache::lonhomework::type eq 'randomizetry')) {
             if ($numtries) {              my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
                 if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {              if ($tries) {
                     my $inc = int($numtries/$reqtries);                  $rndseed += $tries;
                     $rndseed += $inc;  
                 } else {  
                     $rndseed += $numtries;  
                 }  
             }              }
             $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;              $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
         }          }
Line 722  sub setup_rndseed { Line 608  sub setup_rndseed {
        $rndseed=join(':',&Apache::lonnet::digest($rndseed));         $rndseed=join(':',&Apache::lonnet::digest($rndseed));
             }              }
         }          }
         if (($env{'form.code_for_randomlist'}) && ($target eq 'analyze')) {          if ($Apache::lonhomework::history{'resource.CODE'}) {
             $env{'form.CODE'} = $env{'form.code_for_randomlist'};  
             $rndseed=&Apache::lonnet::rndseed();  
             undef($env{'form.CODE'});  
         } elsif ($Apache::lonhomework::history{'resource.CODE'}) {  
    $rndseed=&Apache::lonnet::rndseed();     $rndseed=&Apache::lonnet::rndseed();
  }   }
         $set_safespace = 1;          $set_safespace = 1;
Line 738  sub setup_rndseed { Line 620  sub setup_rndseed {
         }          }
         unless (($target eq 'analyze') && (defined($rndseed))) {          unless (($target eq 'analyze') && (defined($rndseed))) {
             $rndseed=&Apache::lonnet::rndseed();              $rndseed=&Apache::lonnet::rndseed();
             my $curr_try = $numtries;              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') {              if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                 $curr_try ++;                  $curr_try ++;
             }              }
Line 746  sub setup_rndseed { Line 634  sub setup_rndseed {
                 $rndseed = $1;                  $rndseed = $1;
             }              }
             if ($curr_try) {              if ($curr_try) {
                   my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
                 if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {                  if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
                     my $inc = int(($curr_try-1)/$reqtries);                      my $inc = int(($curr_try-1)/$reqtries);
                     $rndseed += $inc;                      $rndseed += $inc;
Line 787  sub problem_edit_action_button { Line 676  sub problem_edit_action_button {
   
 sub problem_edit_buttons {  sub problem_edit_buttons {
    my ($mode)=@_;     my ($mode)=@_;
 # Buttons that save  
    my $result = '<div style="float:right">';  
    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";  
 # Buttons that do not save  # Buttons that do not save
    $result .= '<div>'.     my $result='<div class="LC_edit_problem_discards">'.
               &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);                &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
    if ($mode eq 'editxml') {     if ($mode eq 'editxml') {
        $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);         $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
        $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);         $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
        if ($env{'environment.nocodemirror'}) {         $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
            $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);  
        }  
    } else {     } else {
        $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);         $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
        $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);         $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
    }     }
    $result.="\n</div>";     $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;     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|\n|\\r\\n|g;
           $return =~ s|'|\\'|g;
    $return =~ s|&#39;|\\&#39;|g;
       return $return;
   }
   
 sub problem_edit_header {  sub problem_edit_header {
     my ($mode)=@_;      my ($mode)=@_;
     my $return = '<input type="hidden" name="submitted" value="edit" />'.      my $return = '<input type="hidden" name="submitted" value="edit" />'.
Line 821  sub problem_edit_header { Line 912  sub problem_edit_header {
         <div class="LC_edit_problem_header">          <div class="LC_edit_problem_header">
         <div class="LC_edit_problem_header_title">          <div class="LC_edit_problem_header_title">
         '.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'          '.&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">'.          </div><div class="LC_edit_actionbar" id="actionbar">'.
          '<input type="hidden" name="problemmode" value="saveedit" />'.          '<input type="hidden" name="problemmode" value="saveedit" />'.
          &problem_edit_buttons();          &problem_edit_buttons();
   
     $return .= '</div></div>' . &Apache::lonxml::message_location();      $return.='<hr style="clear:both;visibility:hidden;" />
       </div></div>'
       .&Apache::lonxml::message_location();
     $return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />      $return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />
     <script type="text/javascript" src="/adm/codemirror/codemirror-compressed-colorful.js"></script>';      <script type="text/javascript" src="/adm/codemirror/codemirror-compressed-colorful.js"></script>';
   
Line 838  sub problem_edit_header { Line 931  sub problem_edit_header {
                         $(\'.LC_edit_actionbar\').scrollToFixed(                          $(\'.LC_edit_actionbar\').scrollToFixed(
                             {                              {
                                 fixed: function(){                                  fixed: function(){
                                     //$(this).find(\'.LC_edit_actionbar\').css(\'height\', \'31px\');                                      $(this).find(\'.LC_edit_actionbar\').css(\'height\', \'31px\');
                                     $(this).find(\'.LC_edit_actionbar\');  
                                 }                                  }
                             }                              }
                         );                          );
Line 851  sub problem_edit_header { Line 943  sub problem_edit_header {
     return $return;      return $return;
 }  }
   
   
 sub problem_edit_footer {  sub problem_edit_footer {
     my $resource = $env{'request.ambiguous'};      my $resource = $env{'request.ambiguous'};
     return '</td></tr></table><br />      return '</td></tr></table><br />
Line 927  sub problem_web_to_edit_header { Line 1018  sub problem_web_to_edit_header {
 ".&mt("Problem Type:")."  ".&mt("Problem Type:")."
 <select name='problemtype'>  <select name='problemtype'>
   <option value=''></option>    <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('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>    ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
   ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>    ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
Line 1047  sub initialize_storage { Line 1138  sub initialize_storage {
  }   }
  %Apache::lonhomework::history=   %Apache::lonhomework::history=
     &Apache::lonnet::tmprestore($namespace,'',$domain,$name);      &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");   &Apache::lonxml::debug("Return message of $temp");
     } else {      } else {
  %Apache::lonhomework::history=   %Apache::lonhomework::history=
Line 1070  sub initialize_storage { Line 1161  sub initialize_storage {
         &check_correctness_changes() is called in two circumstances          &check_correctness_changes() is called in two circumstances
         in which the results hash is to be stored permanently, for          in which the results hash is to be stored permanently, for
         grading triggered by a student's submission, where feedback on          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          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.,          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          multiple tabs).  &Apache::inputtags::hidealldata() is called for
         any parts with out-of-order storage (i.e., correct then incorrect,          any parts with out-of-order storage (i.e., correct then incorrect,
         where awarded >= 1 when correct).          where awarded >= 1 when correct).
Line 1086  sub initialize_storage { Line 1177  sub initialize_storage {
         To handle the case where lond on the student's homeserver returns          To handle the case where lond on the student's homeserver returns
         delay:N -- where N is the number of transactions between the last          delay:N -- where N is the number of transactions between the last
         retrieved in &initialize_storage() and the last stored immediately          retrieved in &initialize_storage() and the last stored immediately
         before permanent storage of the current transaction via          before permanent storage of the current transaction via 
         lond::store_handler().  &Apache::grades::makehidden() is called          lond::store_handler().  &Apache::grades::makehidden() is called  
         for any parts with out-of-order storage (i.e., correct then incorrect,          for any parts with out-of-order storage (i.e., correct then incorrect,
         where awarded >= 1 when correct).          where awarded >= 1 when correct).
   
  Will call &store_aggregates() to increment totals for attempts,    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  =cut
   
   
Line 1214  sub finalize_storage { Line 1305  sub finalize_storage {
 =item check_correctness_changes()  =item check_correctness_changes()
   
         For all parts for which current results contain a solved status          For all parts for which current results contain a solved status
         of "incorrect_attempted", check if there was a transaction in which          of "incorrect_attempted", check if there was a transaction in which  
         solved was set to "correct_by_student" in the time since the last          solved was set to "correct_by_student" in the time since the last 
         transaction (retrieved when &initialize_storage() was called i.e.,          transaction (retrieved when &initialize_storage() was called i.e., 
         when &start_problem() was called), unless:          when &start_problem() was called), unless:
         (a) questiontype parameter is set to survey or anonymous survey (+/- credit)          (a) questiontype parameter is set to survey or anonymous survey (+/- credit)
         (b) problemstatus is set to no or no_feedback_ever          (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          by a user with grading privileges, then the current transaction is an
         example of an out-of-order transaction (i.e., incorrect occurring after          example of an out-of-order transaction (i.e., incorrect occurring after
         correct).  Accordingly, the current transaction should be hidden.          correct).  Accordingly, the current transaction should be hidden.
Line 1348  sub checkout_msg { Line 1439  sub checkout_msg {
  'resource'=>'The resource needs to be checked out',   '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.',   '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.',                  '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 Bubblesheet Exam for Viewing',
  'checkout?'=>'Check out Exam?');   'checkout?'=>'Check out Bubblesheet Exam?');
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});      my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);      return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>  <h2>$lt{'resource'}</h2>
Line 1426  sub init_problem_globals { Line 1517  sub init_problem_globals {
     @Apache::inputtags::importlist = ();      @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();      @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();      @Apache::inputtags::previous_version=();
     $Apache::inputtags::leniency='';  
     $Apache::structuretags::printanswer='No';      $Apache::structuretags::printanswer='No';
     @Apache::structuretags::whileconds=();      @Apache::structuretags::whileconds=();
     @Apache::structuretags::whilebody=();      @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();      @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;      $Apache::lonhomework::scantronmode=0;
     $Apache::lonhomework::randomizetrypart=0;  
     undef($Apache::lonhomework::name);      undef($Apache::lonhomework::name);
     undef($Apache::lonhomework::default_type);      undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);      undef($Apache::lonhomework::type);
Line 1443  sub reset_problem_globals { Line 1532  sub reset_problem_globals {
     undef(%Apache::lonhomework::history);      undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);      undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);      undef($Apache::inputtags::part);
     undef($Apache::inputtags::leniency);  
     if ($type eq 'Task') {      if ($type eq 'Task') {
         undef($Apache::inputtags::slot_name);          undef($Apache::inputtags::slot_name);
     } elsif ($type eq 'problem') {      } elsif ($type eq 'problem') {
Line 1456  sub reset_problem_globals { Line 1544  sub reset_problem_globals {
     undef($Apache::lonhomework::default_type);      undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);      undef($Apache::lonhomework::type);
     undef($Apache::lonhomework::scantronmode);      undef($Apache::lonhomework::scantronmode);
     undef($Apache::inputtags::randomizetrypart);  
     undef($Apache::lonhomework::ignore_response_errors);      undef($Apache::lonhomework::ignore_response_errors);
     undef(@Apache::functionplotresponse::callscripts);      undef(@Apache::functionplotresponse::callscripts);
     &Apache::lonhomework::reset_show_problem_status();      &Apache::lonhomework::reset_show_problem_status();
Line 1550  sub start_problem { Line 1637  sub start_problem {
     my $resource_due;      my $resource_due;
   
     my $name= &get_resource_name($parstack,$safeeval);      my $name= &get_resource_name($parstack,$safeeval);
     my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres);      my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {          $target eq 'tex') {
         if ($env{'form.markaccess'}) {          if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");              my @interval=&Apache::lonnet::EXT("resource.0.interval");
             my ($timelimit) = ($interval[0] =~ /^(\d+)/);              &Apache::lonnet::set_first_access($interval[1],$interval[0]);
             my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit);  
             unless (($is_set eq 'ok') || ($is_set eq 'already_set')) {  
                 $firstaccres = $is_set;  
             }  
         }          }
   
         ($status,$accessmsg,$slot_name,$slot) =          ($status,$accessmsg,$slot_name,$slot) =
Line 1575  sub start_problem { Line 1658  sub start_problem {
  $name);   $name);
     } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {      } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {
         my ($symb)= &Apache::lonnet::whichuser();          my ($symb)= &Apache::lonnet::whichuser();
         if ($symb ne '') {          my $navmap = Apache::lonnavmaps::navmap->new();
             my $navmap = Apache::lonnavmaps::navmap->new();          if (ref($navmap)) {
             if (ref($navmap)) {              my $res = $navmap->getBySymb($symb);
                 my $res = $navmap->getBySymb($symb);              if (ref($res)) {
                 if (ref($res)) {                  $probpartlist = $res->parts();
                     $probpartlist = $res->parts();  
                 }  
             }              }
         }          }
     }      }
Line 1592  sub start_problem { Line 1673  sub start_problem {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
   
         my ($symb) = &Apache::lonnet::whichuser();  
  #handle rand seed in construction space   #handle rand seed in construction space
         if (($env{'request.state'} eq 'construct') || ($symb eq '')) {  
             my $partorder=&Apache::lonnet::metadata($env{'request.uri'},'partorder');  
             if ($partorder ne '') {  
                 @{$probpartlist} = split(/,/,$partorder);  
             }  
         }  
  my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);   my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);
         if (($target eq 'grade') && &Apache::response::submitted()) {          if (($target eq 'grade') && &Apache::response::submitted()) {
             if ($Apache::lonhomework::type eq 'randomizetry') {              if ($Apache::lonhomework::type eq 'randomizetry') {
Line 1614  sub start_problem { Line 1688  sub start_problem {
                 }                  }
             }              }
         }          }
    my ($symb)=&Apache::lonnet::whichuser();
   
  if ($env{'request.state'} ne "construct" &&    if ($env{'request.state'} ne "construct" && 
     ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {      ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
             my $rndseedval = $rndseed;  
             if (($symb eq '') && ($Apache::lonhomework::type eq 'randomizetry')) {  
                 $rndseedval = $env{'form.rndseed'};  
             }  
     $form_tag_start.='<input type="hidden" name="rndseed" value="'.      $form_tag_start.='<input type="hidden" name="rndseed" value="'.
  $rndseedval.'" />'.   $rndseed.'" />'.
     '<input type="submit" name="resetdata"      '<input type="submit" name="resetdata"
                              value="'.&mt('New Problem Variation').'" />';                               value="'.&mt('New Problem Variation').'" />';
     if (exists($env{'form.username'})) {      if (exists($env{'form.username'})) {
Line 1644  sub start_problem { Line 1715  sub start_problem {
                 $form_tag_start.=&practice_problem_header();                  $form_tag_start.=&practice_problem_header();
             }              }
     $form_tag_start.='<hr />';      $form_tag_start.='<hr />';
         }          } elsif (($env{'request.state'} ne "construct") &&
         if (($env{'request.state'} ne "construct") &&                   ($Apache::lonhomework::type eq 'randomizetry') &&
             ($Apache::lonhomework::type eq 'randomizetry') &&                   ($status eq 'CAN_ANSWER')) {
             ($status eq 'CAN_ANSWER')) {              my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
             my @parts;              my $problemstatus = &get_problem_status($Apache::inputtags::part);
             if (ref($probpartlist) eq 'ARRAY') {              $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries);
                 @parts = @{$probpartlist};  
             }  
             unless (@parts) {  
                 my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");  
                 my $problemstatus = &get_problem_status($Apache::inputtags::part);  
                 $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries,$symb);  
             }  
         }          }
   
  my $expression='$external::datestatus="'.$status.'";';   my $expression='$external::datestatus="'.$status.'";';
Line 1693  sub start_problem { Line 1757  sub start_problem {
  } elsif ($status eq 'UNCHECKEDOUT') {   } elsif ($status eq 'UNCHECKEDOUT') {
     $msg.=&checkout_msg();      $msg.=&checkout_msg();
  } elsif ($status eq 'NOT_YET_VIEWED') {   } elsif ($status eq 'NOT_YET_VIEWED') {
                     if ($firstaccres) {  
                         $msg .= '<p class="LC_error">'.  
                                 &mt('A problem occurred when trying to start the timer.').'</p>';  
                     }  
     $msg.=&firstaccess_msg($accessmsg,$symb);      $msg.=&firstaccess_msg($accessmsg,$symb);
  } elsif ($status eq 'NOT_IN_A_SLOT') {   } elsif ($status eq 'NOT_IN_A_SLOT') {
     $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");      $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
Line 1772  sub start_problem { Line 1832  sub start_problem {
                     $result.= '<input type="submit" name="resetdata" '.                      $result.= '<input type="submit" name="resetdata" '.
                               'value="'.&mt('New Problem Variation').'" />'.                                'value="'.&mt('New Problem Variation').'" />'.
                               &practice_problem_header().'<hr />';                                &practice_problem_header().'<hr />';
                 } elsif ($Apache::lonhomework::type eq 'randomizetry') {  
                     my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");  
                     my $problemstatus = &get_problem_status($Apache::inputtags::part);  
                     $result.=&randomizetry_problem_header($problemstatus,$reqtries);  
                 }                  }
     }      }
     # if we are viewing someone else preserve that info      # if we are viewing someone else preserve that info
Line 1977  sub end_problem { Line 2033  sub end_problem {
     }      }
  }   }
         if ($target eq 'web') {          if ($target eq 'web') {
             $result.=&Apache::functionplotresponse::init_script();             $result.=&Apache::functionplotresponse::init_script();
             if ($Apache::lonhomework::default_type eq 'randomizetry') {  
                 my ($symb) = &Apache::lonnet::whichuser();  
                 if ((($env{'request.state'} eq 'construct') || ($symb eq '')) &&  
                     ($status eq 'CAN_ANSWER')) {  
                     unless (@Apache::inputtags::partlist > 1) {  
                         $result.= <<"ENDJS";  
 <script type="text/javascript">  
 // <![CDATA[  
     \$(document).ready(function() {  
          \$('#LC_randomizetry_header').css('display','block');  
     });  
 // ]]>  
 </script>  
 ENDJS  
                     }  
                 }  
             }  
         }          }
  if ($target eq 'grade') {   if ($target eq 'grade') {
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
Line 2088  sub end_library { Line 2127  sub end_library {
      && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')        && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
      && $env{'request.state'} eq "construct") {       && $env{'request.state'} eq "construct") {
  $result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});   $result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
     } elsif ($target eq 'meta') {  
         $result.=&Apache::response::meta_response_order();  
     }      }
     if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {      if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
  &reset_problem_globals('library');   &reset_problem_globals('library');
Line 2572  sub start_randomlist { Line 2609  sub start_randomlist {
  }   }
  if (@randomlist) {   if (@randomlist) {
     my @idx_arr = (0 .. $#randomlist);      my @idx_arr = (0 .. $#randomlist);
             if ($env{'form.code_for_randomlist'}) {      &Apache::structuretags::shuffle(\@idx_arr);
                 &Apache::structuretags::shuffle(\@idx_arr,$target);  
                 undef($env{'form.code_for_randomlist'});  
             } else {  
                 &Apache::structuretags::shuffle(\@idx_arr);  
             }  
     my $bodytext = '';      my $bodytext = '';
     my $show=$#randomlist;      my $show=$#randomlist;
     my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);      my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
Line 2616  sub start_randomlist { Line 2648  sub start_randomlist {
 }  }
   
 sub shuffle {  sub shuffle {
     my ($a,$target) = @_;      my $a=shift;
     my $i;      my $i;
     if (ref($a) eq 'ARRAY' && @$a) {      if (ref($a) eq 'ARRAY' && @$a) {
  &Apache::response::pushrandomnumber(undef,$target);   &Apache::response::pushrandomnumber();
  for($i=@$a;--$i;) {   for($i=@$a;--$i;) {
     my $j=int(&Math::Random::random_uniform() * ($i+1));      my $j=int(&Math::Random::random_uniform() * ($i+1));
     next if $i == $j;      next if $i == $j;
Line 2703  sub start_part { Line 2735  sub start_part {
     my $id= &Apache::lonxml::get_id($parstack,$safeeval);      my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $Apache::inputtags::part=$id;      $Apache::inputtags::part=$id;
     push(@Apache::inputtags::partlist,$id);      push(@Apache::inputtags::partlist,$id);
     $Apache::inputtags::leniency='';  
     @Apache::inputtags::response=();      @Apache::inputtags::response=();
     @Apache::inputtags::previous=();      @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();      @Apache::inputtags::previous_version=();
Line 2793  sub start_part { Line 2824  sub start_part {
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
                     if ($status eq 'CAN_ANSWER') {                      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;                          my $num = scalar(@Apache::inputtags::partlist)-1;
                         if ((($Apache::lonhomework::default_type eq 'randomizetry') ||                          if ($probrandomize eq 'randomizetry') {
                              ($Apache::lonhomework::randomizetrypart)) &&                              if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") ne 'randomizetry') {
                             ($Apache::lonhomework::type ne 'randomizetry')) {                                  $result .= &randomizetry_part_header($problemstatus,'none',$num);
                             $result .= &randomizetry_part_header($problemstatus,'none',$num);                              } else {
                         } elsif ($Apache::lonhomework::type eq 'randomizetry') {                                  my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
                             $Apache::lonhomework::randomizetrypart = 1;                                  if ($probrandtries ne $reqtries) {
                             my $reqtries = &Apache::lonnet::EXT("resource.$id.randomizeontries");                                      $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
                                   }
                               }
                           } elsif (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") eq 'randomizetry') {
                               my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
                             $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);                              $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
                         }                          }
                     }                      }
Line 2863  sub end_part { Line 2900  sub end_part {
     }      }
     pop @Apache::inputtags::status;      pop @Apache::inputtags::status;
     $Apache::inputtags::part='';      $Apache::inputtags::part='';
     $Apache::inputtags::leniency='';  
     $Apache::lonhomework::type = $Apache::lonhomework::default_type;      $Apache::lonhomework::type = $Apache::lonhomework::default_type;
     return $result;      return $result;
 }  }
Line 2971  sub start_problemtype { Line 3007  sub start_problemtype {
     ['hide','Hide']]      ['hide','Hide']]
    ,$token);     ,$token);
  $result .=&Apache::edit::checked_arg('When used as type(s):','for',   $result .=&Apache::edit::checked_arg('When used as type(s):','for',
      [ ['exam','Exam/Quiz Problem'],       [ ['exam','Bubblesheet Exam/Quiz Problem'],
        ['survey','Survey'],         ['survey','Survey'],
                                                ['surveycred','Survey (with credit)'],                                                 ['surveycred','Survey (with credit)'],
                                                ['anonsurvey','Anonymous Survey'],                                                 ['anonsurvey','Anonymous Survey'],
Line 3019  sub end_startouttext { Line 3055  sub end_startouttext {
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '                   .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)                   .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'                   .'</span></td>'
          .'<td><span id="math_'.$areaid.'">';           .'<td><span id="math_'.$areaid.'">'
  if ($env{'environment.nocodemirror'}) {   .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
     $result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);   .'</span></td>'
  } else {  
     $result.='&nbsp;';  
  }  
  $result.='</span></td>'  
  .'<td>'   .'<td>'
  .&Apache::edit::insertlist($target,$token)   .&Apache::edit::insertlist($target,$token)
  .'</td>'   .'</td>'
Line 3120  sub practice_problem_header { Line 3152  sub practice_problem_header {
 }  }
   
 sub randomizetry_problem_header {  sub randomizetry_problem_header {
     my ($problemstatus,$reqtries,$symb) = @_;      my ($problemstatus,$reqtries) = @_;
     my ($header,$text);      my ($header,$text);
     if ($reqtries > 1) {      if ($reqtries > 1) {
         $header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);          $header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);
Line 3140  sub randomizetry_problem_header { Line 3172  sub randomizetry_problem_header {
             $text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');              $text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');
         }          }
     }      }
     if (($env{'request.state'} eq "construct") || ($symb eq '')) {      return '<span class="LC_info"><h3>'.$header.'</h3></span>'.
         return '<div class="LC_info" id="LC_randomizetry_header" style="display:none">'.             '<span class="LC_info">'.$text.'</span><hr />';
                '<h3>'.$header.'</h3><span class="LC_info">'.$text.'</span><hr /></div>';  
     } else {  
         return '<h3 class="LC_info">'.$header.'</h3>'.  
                '<span class="LC_info">'.$text.'</span><hr />';  
     }  
 }  }
   
 sub randomizetry_part_header {  sub randomizetry_part_header {
Line 3154  sub randomizetry_part_header { Line 3181  sub randomizetry_part_header {
     my ($header,$text);      my ($header,$text);
     if ($reqtries eq 'none') {      if ($reqtries eq 'none') {
         $header = &mt('No Question Variation');          $header = &mt('No Question Variation');
         $text = &mt('For this question there will be no new variation after a try.');          $text = &mt('For this question there will no new variation after a try.');
     } elsif ($reqtries > 1) {      } elsif ($reqtries > 1) {
         $header = &mt('New Question Variation After Every [quant,_1,Try,Tries]',$reqtries);          $header = &mt('New Question Variation After Every [quant,_1,Try,Tries]',$reqtries);
         if (($problemstatus eq 'no') ||          if (($problemstatus eq 'no') ||

Removed from v.1.512.2.23.2.1  
changed lines
  Added in v.1.529


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>