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

Diff for /loncom/homework/inputtags.pm between versions 1.343 and 1.350

version 1.343, 2016/05/30 02:45:32 version 1.350, 2019/11/20 22:53:37
Line 460  sub start_textline { Line 460  sub start_textline {
  }   }
  my $name = 'HWVAL_'.$id;   my $name = 'HWVAL_'.$id;
                 my $itemid = 'HWVAL_'.$partid.'_'.$id;                  my $itemid = 'HWVAL_'.$partid.'_'.$id;
                   # NOTE: the input id should match the one given by defaut_homework input_id().
                 my $input_tag_id = $itemid.'_'.$input_id;                  my $input_tag_id = $itemid.'_'.$input_id;
  if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {   if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
     $name = "none";      $name = "none";
Line 666  sub file_selector { Line 667  sub file_selector {
     if ($constraints) {      if ($constraints) {
         $result .= $constraints.'<br />';          $result .= $constraints.'<br />';
     }      }
     if ($which eq 'uploadonly' || $which eq 'both') {       if ($which eq 'uploadonly' || $which eq 'both') {
         my $free_space = $maxfilesize * 1048576;          my $free_space = $maxfilesize * 1048576;
         $result .= &mt('Submit a file: (only one file per submission)').          $result .= &mt('Submit a file: (only one file per submission)').
             ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.              ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
             '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" /><br />'.              '" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload LC_hwkfile" />'.
             '<input type="hidden" id="free_space" value="'.$free_space.'" /><br />'              '<input type="hidden" id="LC_free_space_'.$jspart.'_'.$id.'"'.
         }              ' value="'.$free_space.'" /><br />';
       }
     if ( $which eq 'both') {      if ( $which eq 'both') {
  $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';   $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }      }
Line 693  sub file_selector { Line 695  sub file_selector {
     &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.      &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.
     '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.      '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
     '<br />';      '<br />';
   
     }      }
     $result.=&Apache::lonhtmlcommon::row_closure(1);      $result.=&Apache::lonhtmlcommon::row_closure(1);
     return $result;      return $result;
Line 1046  sub decideoutput { Line 1047  sub decideoutput {
   'not_charged_try' => 'LC_answer_not_charged_try',    'not_charged_try' => 'LC_answer_not_charged_try',
   'no_grade'        => 'LC_answer_no_grade',    'no_grade'        => 'LC_answer_no_grade',
   'no_message'      => 'LC_no_message',    'no_message'      => 'LC_no_message',
             'no_charge_warn'  => 'LC_answer_warning',
   );    );
   
     my $part = $Apache::inputtags::part;      my $part = $Apache::inputtags::part;
Line 1211  sub decideoutput { Line 1213  sub decideoutput {
  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 digits.",$used);
  $css_class=$possible_class{'not_charged_try'};   $css_class=$possible_class{'not_charged_try'};
           if (&Apache::lonhomework::show_some_problem_status()) {
               $css_class=$possible_class{'no_charge_warn'};
           }
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {      } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
  $message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);   $message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
Line 1903  sub previous_tries { Line 1908  sub previous_tries {
     my $tries_text = &get_tries_text('link');      my $tries_text = &get_tries_text('link');
     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;
  $Apache::lonxml::curdepth.'_'.$env{'form.counter'};      if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
           $function_name .= $Apache::lonxml::curdepth;
       } else {
           $function_name .= &js_escape($id);
       }
       $function_name .= '_'.$Apache::lonxml::counter;
     my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";      my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
     return $result;      return $result;
 }  }
Removed from v.1.343  
changed lines
  Added in v.1.350

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