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

Diff for /loncom/homework/inputtags.pm between versions 1.351 and 1.358

version 1.351, 2019/11/20 23:00:04 version 1.358, 2023/04/02 03:16:28
Line 474  sub start_textline { Line 474  sub start_textline {
   
  $result .= &spellcheck_onblur($itemid, $spellcheck);   $result .= &spellcheck_onblur($itemid, $spellcheck);
                 if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&                  if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
                     (($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&                      (((($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
                     (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {                        (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) || 
                        (($tagstack->[-2] eq 'customresponse') &&
                          (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) {
                     $result.=&edit_mathresponse_button($input_tag_id);                      $result.=&edit_mathresponse_button($input_tag_id);
                 }                  }
     }      }
Line 657  sub file_selector { Line 659  sub file_selector {
     $result .= &Apache::lonhtmlcommon::row_title($addfiles);      $result .= &Apache::lonhtmlcommon::row_title($addfiles);
     my $constraints;      my $constraints;
     if ($uploadedfiletypes ne '*') {      if ($uploadedfiletypes ne '*') {
           my $showtypes = $uploadedfiletypes;
           if ($showtypes =~ /,/) {
               my $conjunc = &mt('or');
               $showtypes =~ s/,([^,]+)$/ $conjunc $1/;
           }
  $constraints =   $constraints =
     &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';      &mt('Allowed filetypes: [_1]','<b>'.$showtypes.'</b>').'<br />';
     }      }
     if ($maxfilesize) {      if ($maxfilesize) {
         $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',          $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
Line 1162  sub decideoutput { Line 1169  sub decideoutput {
         if ($target ne 'tex') {          if ($target ne 'tex') {
            $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');             $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
         }          }
  $css_class=$possible_class{'not_charged_try'};          if (&Apache::lonhomework::show_some_problem_status()) {
               $css_class=$possible_class{'no_charge_warn'};
           } else {
               $css_class=$possible_class{'not_charged_try'};
           }
  $button = 1;   $button = 1;
     } elsif ($award eq 'WRONG_NUMBOXESCHECKED') {      } elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
         $message = &mt('Number of boxes checked outside permissible range (either too few or too many).');          $message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
Line 1211  sub decideoutput { Line 1222  sub decideoutput {
     } elsif ($award eq 'SIG_FAIL') {      } elsif ($award eq 'SIG_FAIL') {
  my ($used,$min,$max)=split(':',$awardmsg);   my ($used,$min,$max)=split(':',$awardmsg);
  my $word = ($used < $min) ? 'more' : 'fewer';   my $word = ($used < $min) ? 'more' : 'fewer';
  $message = &mt("Submission not graded. Use $word digits.",$used);   $message = &mt("Submission not graded. Use $word significant figures.");
         if (&Apache::lonhomework::show_some_problem_status()) {          if (&Apache::lonhomework::show_some_problem_status()) {
             $css_class=$possible_class{'no_charge_warn'};              $css_class=$possible_class{'no_charge_warn'};
         } else {          } else {
Line 1226  sub decideoutput { Line 1237  sub decideoutput {
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {      } elsif ($award eq 'UNIT_INVALID_STUDENT') {
  $message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));   $message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
  if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}    if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
  $css_class=$possible_class{'not_charged_try'};          if (&Apache::lonhomework::show_some_problem_status()) {
               $css_class=$possible_class{'no_charge_warn'};
           } else {
               $css_class=$possible_class{'not_charged_try'};
           }
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {      } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
  $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));   $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
  if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}    if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
  $css_class=$possible_class{'not_charged_try'};          if (&Apache::lonhomework::show_some_problem_status()) {
               $css_class=$possible_class{'no_charge_warn'};
           } else {
               $css_class=$possible_class{'not_charged_try'};
           }
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {      } elsif ($award eq 'UNIT_NOTNEEDED') {
  $message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));   $message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
  $css_class=$possible_class{'not_charged_try'};          if (&Apache::lonhomework::show_some_problem_status()) {
               $css_class=$possible_class{'no_charge_warn'};
           } else {
               $css_class=$possible_class{'not_charged_try'};
           }
  $button=1;   $button=1;
     } elsif ($award eq 'NO_UNIT') {      } elsif ($award eq 'NO_UNIT') {
  $message = &mt("Units required").'.';   $message = &mt("Units required").'.';
  if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};   if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
  $css_class=$possible_class{'not_charged_try'};          if (&Apache::lonhomework::show_some_problem_status()) {
               $css_class=$possible_class{'no_charge_warn'};
           } else {
               $css_class=$possible_class{'not_charged_try'};
           }
  $button=1;   $button=1;
     } elsif ($award eq 'COMMA_FAIL') {      } elsif ($award eq 'COMMA_FAIL') {
  $message = &mt("Proper comma separation is required").'.';   $message = &mt("Proper comma separation is required").'.';
Line 1760  sub gradestatus { Line 1787  sub gradestatus {
  }   }
  if ( $showbutton ) {   if ( $showbutton ) {
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $button =                   if ($env{'form.disable_submit'}) {
                       $button = '<input type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" value="'.&mt('Submit Answer').'" disabled="disabled" />&nbsp;'.
                                  '<div id="msg_submit_'.$id.'" style="display:none"></div>';
                   } else {
       $button =
             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"              '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
                     type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"                      type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
                     value="'.&mt('Submit Answer').'" />&nbsp;'.                      value="'.&mt('Submit Answer').'" />&nbsp;'.
                     '<div id="msg_submit_'.$id.'" style="display:none">'.                      '<div id="msg_submit_'.$id.'" style="display:none">'.
                     &mt('Processing your submission ...').'</div>';                      &mt('Processing your submission ...').'</div>';
                   }
     }      }
  }   }
   
Line 1910  sub previous_tries { Line 1942  sub previous_tries {
     my $prefix = $env{'form.request.prefix'};      my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};      $prefix =~ tr{.}{_};
     my $function_name = 'LONCAPA_previous_tries_'.$prefix;      my $function_name = 'LONCAPA_previous_tries_'.$prefix;
     if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {      if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
         $function_name .= $Apache::lonxml::curdepth;          $function_name .= $Apache::lonxml::curdepth;
     } else {      } else {
         $function_name .= &js_escape($id);          $function_name .= $id;
     }      }
     $function_name .= '_'.$Apache::lonxml::counter;      $function_name .= '_'.$Apache::lonxml::counter;
     my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";      my $possmathjax = 1;
       my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
                                                           &mt($tries_text),$possmathjax)."<br />";
     return $result;      return $result;
 }  }
   
Removed from v.1.351  
changed lines
  Added in v.1.358

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