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

Diff for /loncom/homework/inputtags.pm between versions 1.302 and 1.305

version 1.302, 2012/03/11 20:17:10 version 1.305, 2012/08/03 15:15:56
Line 576  sub file_selector { Line 576  sub file_selector {
     if ( $which eq 'both') {      if ( $which eq 'both') {
  $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';   $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }      }
     if ($which eq 'portfolioonly' || $which eq 'both') {       if ($which eq 'portfolioonly' || $which eq 'both') {
  $result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.          my $symb = $env{'request.symb'};
           (undef,undef,my $res)=&Apache::lonnet::decode_symb($symb);
           my $showsymb;
           # If resource is a .task and URL is unencrypted, include symb in query string
           # for url opened in portfolio file selection window. Can be used to override
           # blocking of portfolio access resulting from an exam event in a different course. 
           if ($res =~ /\.task$/i) {
               my $encsymb = &Apache::lonenc::check_encrypt($symb);
               if ($symb eq $encsymb) {
                   $showsymb = $symb;
               }
           }
    $result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'&symb='.$showsymb.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
     &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 />';
Line 1127  sub decideoutput { Line 1139  sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()      if (&Apache::lonhomework::hide_problem_status()
  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'   && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
  && &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");
           if ($interval[0] =~ /\d+/) {
               my $first_access=&Apache::lonnet::get_first_access($interval[1]);
               if (defined($first_access)) {
                   my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
                   unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
                       $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
                   }
               }
           }
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
     }      }
Line 1500  sub gradestatus { Line 1522  sub gradestatus {
          && $status ne 'RESERVABLE_LATER'           && $status ne 'RESERVABLE_LATER'
          && $status ne 'NOTRESERVABLE') {           && $status ne 'NOTRESERVABLE') {
   
    if ($status eq 'SHOW_ANSWER') {
               $showbutton = 0;
           }
   
  ($previousmsg,$latemessage,$message,$trystr) =   ($previousmsg,$latemessage,$message,$trystr) =
     &get_grade_messages($id,"resource.$id",$target,$status,      &get_grade_messages($id,"resource.$id",$target,$status,
  $showbutton);   $showbutton);
  if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {   if ($status eq 'CANNOT_ANSWER') {
     $showbutton = 0;      $showbutton = 0;
  }   }
  if ( $status eq 'SHOW_ANSWER') {   if ( $status eq 'SHOW_ANSWER') {
Removed from v.1.302  
changed lines
  Added in v.1.305

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