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

Diff for /loncom/homework/bridgetask.pm between versions 1.65 and 1.68

version 1.65, 2005/10/03 21:30:58 version 1.68, 2005/10/05 20:24:59
Line 395  sub start_Task { Line 395  sub start_Task {
     $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'}) {
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle();
     my $files=$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'};      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     $result.= $head_tag_start.'</head>'.$body_tag_start;      my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';
     $result.=<<DONESCREEN;      $result.=<<DONESCREEN;
 <h2>$title</h2>  <h2>$title</h2>
 <p> Files submitted: $files </p>  <p> Files submitted: $files </p>
 <p> You are now done with the Bridge Task </p>  <p> You are now done with this Bridge Task </p>
 <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>
Line 1089  sub queue_key_locked { Line 1089  sub queue_key_locked {
 sub pick_from_queue_data {  sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;      my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
     foreach my $key (keys(%$queuedata)) {      foreach my $key (keys(%$queuedata)) {
    if ($key =~ /\0locked$/) { next; }
    if ($key =~ /\0timestamp$/) { next; }
  my ($symb,$uname,$udom)=&decode_queue_key($key);   my ($symb,$uname,$udom)=&decode_queue_key($key);
  if ($check_section) {   if ($check_section) {
     my $section=&Apache::lonnet::getsection($uname,$udom);      my $section=&Apache::lonnet::getsection($uname,$udom);
Line 1421  sub get_instance { Line 1423  sub get_instance {
     }      }
  }   }
  if ($man_passed eq $man_count) { $man_passed='all'; }   if ($man_passed eq $man_count) { $man_passed='all'; }
  my $opt_req=&Apache::lonxml::get_param('OptionalRequired',   my $opt_req=$dimension{$instance.'.optionalrequired'};
        $parstack,$safeeval);  
  if ($opt_req !~ /\S/) { $opt_req='0'; }   if ($opt_req !~ /\S/) { $opt_req='0'; }
  $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";   $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
   
Removed from v.1.65  
changed lines
  Added in v.1.68

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