Diff for /loncom/homework/bridgetask.pm between versions 1.166 and 1.167

version 1.166, 2006/06/12 18:57:20 version 1.167, 2006/06/12 23:17:56
Line 419  sub done_screen { Line 419  sub done_screen {
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user)= &Apache::lonxml::whichuser();
     my $files = '<ul>';      my $files = '<ul>';
       my $msg;
     foreach my $file (@files) {      foreach my $file (@files) {
  my $url="/uploaded/$domain/$user/portfolio$file";   my $url="/uploaded/$domain/$user/portfolio$file";
  if (! &Apache::lonnet::stat_file($url)) {   if (! &Apache::lonnet::stat_file($url)) {
     $file = &mt('<span class="LC_error"> Nonexistent file:</span> '.      $file = &mt('<span class="LC_error"> Nonexistent file:</span> '.
  '<span class="LC_filename">[_1]</span>',$file);   '<span class="LC_filename">[_1]</span>',$file);
       $msg .= "<p>Submitted non-existant file $file</p>\n";
  } else {   } else {
     $file = '<span class="LC_filename">'.$file.'</span>';      $file = '<span class="LC_filename">'.$file.'</span>';
       $msg .= "<p>Submitted file $file</p>\n";
  }   }
  $files .= '<li>'.$file.'</li>';   $files .= '<li>'.$file.'</li>';
     }      }
     $files.='</ul>';      $files.='</ul>';
           my $subject = "Submission message for $title";
       my ($message_status,$comment_status);
       my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};
       $setting =~ s/^\s*(\S*)\s*$/$1/;
       $setting = lc($setting);
       if ($setting eq 'only_student'
    || $setting eq 'student_and_user_notes_screen') {
    $message_status =
       &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);
    $message_status = '<p>'.&mt('Message sent to user: [_1]',
       $message_status).' </p>';
       }
       if ($setting eq 'student_and_user_notes_screen') {
    $comment_status = 
       &Apache::lonmsg::store_instructor_comment($subject.'<br />'.
         $msg,$user,$domain);
    $comment_status = '<p>'.&mt('Message sent to instructor: [_1]',
       $comment_status).' </p>';
       }
     return <<DONESCREEN;      return <<DONESCREEN;
 <h2>$title</h2>  <h2>$title</h2>
 <p> Files submitted: $files </p>  <p> Files submitted: $files </p>
Line 438  sub done_screen { Line 459  sub done_screen {
 <hr />  <hr />
 <p> <a href="/adm/logout">Logout</a> </p>  <p> <a href="/adm/logout">Logout</a> </p>
 <p> <a href="/adm/roles">Change to a different course</a> </p>  <p> <a href="/adm/roles">Change to a different course</a> </p>
   $message_status
   $comment_status
 DONESCREEN  DONESCREEN
   
 }  }
Line 542  sub start_Task { Line 565  sub start_Task {
  } elsif ($status eq 'WAITING_FOR_GRADE') {   } elsif ($status eq 'WAITING_FOR_GRADE') {
     $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';      $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
  } elsif ($env{'form.donescreen'}) {   } elsif ($env{'form.donescreen'}) {
     $result .= &done_screen();      $result .= &done_screen($version);
  } elsif ($status ne 'NOT_YET_VIEWED') {   } elsif ($status ne 'NOT_YET_VIEWED') {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }

Removed from v.1.166  
changed lines
  Added in v.1.167


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