[BACK]Return to structuretags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.532 and 1.545

version 1.532, 2015/03/10 23:11:22 version 1.545, 2016/04/02 04:16:19
Line 490  sub page_start { Line 490  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 521  sub page_start { Line 523  sub page_start {
     } elsif (!defined($found{'body'})       } elsif (!defined($found{'body'}) 
      && $env{'request.state'} eq 'construct') {       && $env{'request.state'} eq 'construct') {
  if ($target eq 'web' || $target eq 'edit') {   if ($target eq 'web' || $target eq 'edit') {
         # Breadcrumbs for Authoring Space              unless ($env{'form.inhibitmenu'} eq 'yes') {
         &Apache::lonhtmlcommon::clear_breadcrumbs();                  # Breadcrumbs for Authoring Space
         &Apache::lonhtmlcommon::add_breadcrumb({                  &Apache::lonhtmlcommon::clear_breadcrumbs();
             'text'  => 'Authoring Space',                  &Apache::lonhtmlcommon::add_breadcrumb({
             'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),                      'text'  => 'Authoring Space',
         });                      'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),
         # breadcrumbs (and tools) will be created                   });
         # in start_page->bodytag->innerregister                  # breadcrumbs (and tools) will be created 
                   # in start_page->bodytag->innerregister
   
 # FIXME Where are we?  # FIXME Where are we?
 #        &Apache::lonhtmlcommon::add_breadcrumb({  #                &Apache::lonhtmlcommon::add_breadcrumb({
 #            'text'  => 'Problem Editing', # 'Problem Testing'  #                    'text'  => 'Problem Editing', # 'Problem Testing'
 #            'href'  => '',  #                    'href'  => '',
 #        });  #               });
         $pageheader =&Apache::loncommon::head_subbox(                  $pageheader = &Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader());                                   &Apache::loncommon::CSTR_pageheader());
  }      }
           }
     } elsif (!defined($found{'body'})) {      } elsif (!defined($found{'body'})) {
  my %add_entries;   my %add_entries;
  my $background=&Apache::lonxml::get_param('background',$parstack,   my $background=&Apache::lonxml::get_param('background',$parstack,
Line 752  sub problem_edit_action_button { Line 756  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
    my $result='<div class="LC_edit_problem_discards">'.     $result .= '<div>'.
               &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);
Line 764  sub problem_edit_buttons { Line 778  sub problem_edit_buttons {
        $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|\\|\\\\|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 993  sub problem_edit_header { Line 792  sub problem_edit_header {
         '<input type="hidden" name="problemmode" value="saveedit" />'.          '<input type="hidden" name="problemmode" value="saveedit" />'.
         &problem_edit_buttons();          &problem_edit_buttons();
   
     $return.='<hr style="clear:both;visibility:hidden;" />      $return .= '</div></div>' . &Apache::lonxml::message_location();
     </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 1008  sub problem_edit_header { Line 805  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 1180  $show_all Line 978  $show_all
                'onclick="javascript:setmode(this.form,'."'edit'".')" />';                 'onclick="javascript:setmode(this.form,'."'edit'".')" />';
     $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.      $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';                 'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
       if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
           my $uri = $env{'request.uri'};
           my $daxeurl = '/daxepage'.$uri;
           $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
                     'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
       }
     $result.='      $result.='
    </div>     </div>
    <hr />     <hr />
Line 1482  sub store_aggregates { Line 1286  sub store_aggregates {
             } else {              } else {
                 $anoncounter{$symb."\0".$part} = 1;                  $anoncounter{$symb."\0".$part} = 1;
             }              }
             my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};              my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'};
             if ($needsrelease) {                 if ($needsrelease) {
                 my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};                  my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
                 if ($curr_required eq '') {                  if ($curr_required eq '') {
                     &Apache::lonnet::update_released_required($needsrelease);                      &Apache::lonnet::update_released_required($needsrelease);
Line 1594  sub init_problem_globals { Line 1398  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=();
Line 1609  sub reset_problem_globals { Line 1414  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 1712  sub start_problem { Line 1518  sub start_problem {
     my $status;      my $status;
     my $accessmsg;      my $accessmsg;
     my $resource_due;      my $resource_due;
       my $ipused;
   
     my $name= &get_resource_name($parstack,$safeeval);      my $name= &get_resource_name($parstack,$safeeval);
     my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);      my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
Line 1720  sub start_problem { Line 1527  sub start_problem {
         $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");
             &Apache::lonnet::set_first_access($interval[1],$interval[0]);              my ($timelimit) = split(/_/,$interval[0]);
               &Apache::lonnet::set_first_access($interval[1],$timelimit);
         }          }
   
         ($status,$accessmsg,$slot_name,$slot) =          ($status,$accessmsg,$slot_name,$slot,$ipused) =
             &Apache::lonhomework::check_slot_access('0','problem');              &Apache::lonhomework::check_slot_access('0','problem');
         push (@Apache::inputtags::status,$status);          push (@Apache::inputtags::status,$status);
     }      }
Line 1814  sub start_problem { Line 1622  sub start_problem {
             ( $status eq 'NOTRESERVABLE') ||              ( $status eq 'NOTRESERVABLE') ||
             ( $status eq 'RESERVABLE') ||              ( $status eq 'RESERVABLE') ||
             ( $status eq 'RESERVABLE_LATER') ||              ( $status eq 'RESERVABLE_LATER') ||
     ( $status eq 'INVALID_ACCESS')) {      ( $status eq 'INVALID_ACCESS') ||
               ( $status eq 'NEED_DIFFERENT_IP')) {
     my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
        $style);         $style);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
Line 1847  sub start_problem { Line 1656  sub start_problem {
                               &Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));                                &Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));
                 } elsif ($status eq 'NOTRESERVABLE') {                  } elsif ($status eq 'NOTRESERVABLE') {
                     $msg.=&mt('Not available to make a reservation.');                        $msg.=&mt('Not available to make a reservation.');  
  }   } elsif ($status eq 'NEED_DIFFERENT_IP') {
                       if ($ipused) {
                           $msg.=&mt('You must use the same computer ([_1]) you used when you first accessed this resource using your time/place-based reservation.',"IP: $ipused");
                       } else {
                           $msg.=&mt('Each student must use a different computer to access this resource at this time and/or place.').'<br />'.
                                 &mt('Somebody else has already used this particular computer for that purpose.');
                       }
                   }
  $result.=$msg.'<br />';   $result.=$msg.'<br />';
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''   my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
Line 1867  sub start_problem { Line 1683  sub start_problem {
  $result .=    $result .= 
     &Apache::bridgetask::proctor_validation_screen($slot);      &Apache::bridgetask::proctor_validation_screen($slot);
     } elsif ($target eq 'grade') {      } elsif ($target eq 'grade') {
  &Apache::bridgetask::proctor_check_auth($slot_name,$slot,   my $checkinresult = &Apache::bridgetask::proctor_check_auth($slot_name,$slot,
  'problem');                      'problem');
                   if ($checkinresult = /^error:/) {
                       $result .= 'error';
                   }
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     if ($status eq 'CAN_ANSWER') {      if ($status eq 'CAN_ANSWER') {
Line 1878  sub start_problem { Line 1697  sub start_problem {
                         $Apache::lonhomework::history{'resource.0.checkedin'};                          $Apache::lonhomework::history{'resource.0.checkedin'};
                     if ($checked_in eq '') {                      if ($checked_in eq '') {
                         # unproctored slot access, self checkin                          # unproctored slot access, self checkin
                         &Apache::bridgetask::check_in('problem',undef,undef,                          my $needsiptied;
                                                       $slot_name);                          if (ref($slot)) {
                         $checked_in =                              $needsiptied = $slot->{'iptied'};
                             $Apache::lonhomework::results{"resource.0.checkedin"};                          }
                           my $check = &Apache::bridgetask::check_in('problem',undef,undef,
                                                                     $slot_name,$needsiptied);
                           if ($check =~ /^error: /) {
                               &Apache::lonnet::logthis("Error during self-checkin of problem (symb: $env{'request.symb'}) using slot: $slot_name");
                           } else {
                               $checked_in =
                                   $Apache::lonhomework::results{"resource.0.checkedin"};
                           }
                     }                      }
                     if ((ref($slot) eq 'HASH') && ($checked_in ne '')) {                      if ((ref($slot) eq 'HASH') && ($checked_in ne '')) {
                         if ($slot->{'starttime'} < time()) {                          if ($slot->{'starttime'} < time()) {
Line 1904  sub start_problem { Line 1731  sub start_problem {
       '<input type="hidden" name="submitted" value="yes" />';        '<input type="hidden" name="submitted" value="yes" />';
     # create a page header and exit      # create a page header and exit
     if ($env{'request.state'} eq "construct") {      if ($env{'request.state'} eq "construct") {
  $result.= &problem_web_to_edit_header($env{'form.rndseed'});                  if ($env{'form.inhibitmenu'} eq 'yes') {
                       # error messages can be useful in any case
                       $result.= &Apache::lonxml::message_location();
                   } else {
       $result.= &problem_web_to_edit_header($env{'form.rndseed'});
                   }
                 if ($Apache::lonhomework::type eq 'practice') {                  if ($Apache::lonhomework::type eq 'practice') {
                     $result.= '<input type="submit" name="resetdata" '.                      $result.= '<input type="submit" name="resetdata" '.
                               'value="'.&mt('New Problem Variation').'" />'.                                'value="'.&mt('New Problem Variation').'" />'.
Line 2812  sub start_part { Line 2644  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 2977  sub end_part { Line 2810  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;
 }  }
Removed from v.1.532  
changed lines
  Added in v.1.545

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