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

Diff for /loncom/homework/inputtags.pm between versions 1.340 and 1.347

version 1.340, 2016/04/02 04:30:39 version 1.347, 2019/08/07 19:32:38
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 670  sub file_selector { Line 671  sub file_selector {
         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" />'.
             '<input type="hidden" id="free_space" value="'.$free_space.'" /><br />'              '<input type="hidden" id="free_space" 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 1059  sub decideoutput { Line 1060  sub decideoutput {
 #  #
           
     my $computer = ($handgrade || $nocorrect)? ''      my $computer = ($handgrade || $nocorrect)? ''
                        : " ".&mt("Computer's answer now shown above.");                         : &mt("Computer's answer now shown above.");
     &Apache::lonxml::debug("handgrade has :$handgrade:");      &Apache::lonxml::debug("handgrade has :$handgrade:");
   
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }      if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
Line 1083  sub decideoutput { Line 1084  sub decideoutput {
  $message = '\textbf{'.$message.'}';   $message = '\textbf{'.$message.'}';
     } else {      } else {
  $message = "<b>".$message."</b>";   $message = "<b>".$message."</b>";
  $message.= $computer;                  if ($computer) {
                       $message = "$computer $message";
                   }
     }      }
     $added_computer_text=1;      $added_computer_text=1;
     if ($awarded > 0) {      if ($awarded > 0) {
Line 1127  sub decideoutput { Line 1130  sub decideoutput {
  $message = '\textbf{'.&mt('You are correct.').'}';   $message = '\textbf{'.&mt('You are correct.').'}';
     } else {      } else {
  $message = "<b>".&mt('You are correct.')."</b>";   $message = "<b>".&mt('You are correct.')."</b>";
  $message.= $computer;                  if ($computer) {
                       $message = "$computer $message";
                   }
     }      }
     $added_computer_text=1;      $added_computer_text=1;
     if  ($awarded > 0       if  ($awarded > 0 
Line 1329  sub decideoutput { Line 1334  sub decideoutput {
             my $first_access=&Apache::lonnet::get_first_access($interval[1]);              my $first_access=&Apache::lonnet::get_first_access($interval[1]);
             if (defined($first_access)) {              if (defined($first_access)) {
                 my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");                  my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
                 unless (($due_date) && ($due_date < $first_access + $interval[0])) {                   my ($timelimit) = ($interval[0] =~ /^(\d+)/);
                   unless (($due_date) && ($due_date < $first_access + $timelimit)) { 
                     $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");                      $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
                 }                  }
             }              }
Line 1346  sub decideoutput { Line 1352  sub decideoutput {
     }      }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&       if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
  !$added_computer_text && $target ne 'tex') {   !$added_computer_text && $target ne 'tex') {
  $message.= $computer;          if ($computer) {
               $message = "$computer $message";
           }
  $added_computer_text=1;   $added_computer_text=1;
     }      }
     if ($Apache::lonhomework::type eq 'practice') {      if ($Apache::lonhomework::type eq 'practice') {
Line 1684  sub get_grade_messages { Line 1692  sub get_grade_messages {
     $trial.="/".$Apache::inputtags::params{'maxtries'};      $trial.="/".$Apache::inputtags::params{'maxtries'};
  }   }
     }      }
     $trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';              
               unless (($env{'request.state'} ne "construct") && 
                       ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') && 
                       (!$env{'request.role.adv'})) {
                   $trystr = '<span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span>';
               }
       $trystr = '<td class="'.$tdclass.'">'.$trystr.'</td>';
  }   }
     }      }
   
Line 1751  sub gradestatus { Line 1765  sub gradestatus {
  }   }
   
     }      }
     my $output= $previousmsg.$latemessage.$message;      my $output= $previousmsg.$latemessage.$message.$trystr;
     my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};  
     unless ($crstype eq 'Placement') {  
         $output .= $trystr;  
     }  
     if ($output =~ /^\s*$/) {      if ($output =~ /^\s*$/) {
  return $button;   return $button;
     } else {      } else {
Line 1764  sub gradestatus { Line 1774  sub gradestatus {
  } else {   } else {
     $output =      $output =
  '<table><tr><td>'.$button.'</td>'.$output;   '<table><tr><td>'.$button.'</td>'.$output;
     if ((!$no_previous) && ($crstype ne 'Placement')) {      if ((!$no_previous) &&
                   (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') ||
                    ($env{'request.role.adv'}))) {
  $output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';   $output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
     }      }
     $output.= '</tr></table>';      $output.= '</tr></table>';
Line 1892  sub previous_tries { Line 1904  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.340  
changed lines
  Added in v.1.347

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