Diff for /loncom/homework/bridgetask.pm between versions 1.128.2.10 and 1.128.2.12

version 1.128.2.10, 2006/06/05 17:15:37 version 1.128.2.12, 2006/06/24 01:32:25
Line 368  sub start_Task { Line 368  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
       &Apache::structuretags::init_problem_globals('Task');
     if ($target ne 'webgrade') {      if ($target ne 'webgrade') {
  &Apache::structuretags::init_problem_globals('Task');  
  &Apache::structuretags::initialize_storage();   &Apache::structuretags::initialize_storage();
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   &Apache::lonhomework::showhash(%Apache::lonhomework::history);
  if ($env{'request.state'} eq 'construct') {   if ($env{'request.state'} eq 'construct') {
Line 456  sub start_Task { Line 456  sub start_Task {
     my (undef,undef,$domain,$user)=      my (undef,undef,$domain,$user)=
  &Apache::lonxml::whichuser();   &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";
  $file = '<tt>'.$file.'</tt>';   $file = '<tt>'.$file.'</tt>';
  $files .= '<li>'.$file.'</li>';   $files .= '<li>'.$file.'</li>';
    $msg .= "<p>Submitted file $file</p>\n";
     }      }
     $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>';
       }
   
     $result.=<<DONESCREEN;      $result.=<<DONESCREEN;
 <h2>$title</h2>  <h2>$title</h2>
Line 470  sub start_Task { Line 491  sub start_Task {
 <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
  } 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>';
Line 995  DONEBUTTON Line 1018  DONEBUTTON
  $result.=&Apache::response::meta_stores_write('status','string',   $result.=&Apache::response::meta_stores_write('status','string',
       'Bridge Task Status');        'Bridge Task Status');
     }      }
       &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }

Removed from v.1.128.2.10  
changed lines
  Added in v.1.128.2.12


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