Diff for /loncom/homework/inputtags.pm between versions 1.333.2.4.2.1 and 1.333.2.5

version 1.333.2.4.2.1, 2017/06/13 16:20:40 version 1.333.2.5, 2019/03/18 20:21:14
Line 1318  sub decideoutput { Line 1318  sub decideoutput {
  && &hide_award($award)) {   && &hide_award($award)) {
         $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");          $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
         my @interval= &Apache::lonnet::EXT("resource.$part.interval");          my @interval= &Apache::lonnet::EXT("resource.$part.interval");
         if ($interval[0]) {          if ($interval[0] =~ /\d+/) {
             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");
                 my ($timelimit) = ($interval[0] =~ /^(\d+)/);                  unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
                 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 1872  sub previous_tries { Line 1871  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.333.2.4.2.1  
changed lines
  Added in v.1.333.2.5


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