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

Diff for /loncom/homework/bridgetask.pm between versions 1.67 and 1.191

version 1.67, 2005/10/04 19:41:02 version 1.191, 2006/11/06 16:07:06
Line 38  use Apache::lonlocal; Line 38  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::slotrequest();  use Apache::slotrequest();
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));      &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','GraderNote','ClosingParagraph'));
 }  }
   
   my %dimension;
 sub initialize_bridgetask {  sub initialize_bridgetask {
     # id of current Dimension, 0 means that no dimension is current       # id of current Dimension, 0 means that no dimension is current 
     # (inside <Task> only)      # (inside <Task> only)
     $Apache::bridgetask::dimension='';      @Apache::bridgetask::dimension=();
     # list of all Dimension ids seen      # list of all Dimension ids seen
     @Apache::bridgetask::dimensionlist=();      %Apache::bridgetask::top_dimensionlist=();
     # mandatory attribute of all Dimensions seen  
     %Apache::bridgetask::dimensionmandatory=();  
     # list of all current Instance ids      # list of all current Instance ids
     @Apache::bridgetask::instance=();      %Apache::bridgetask::instance=();
     # list of all Instance ids seen in this problem      # list of all Instance ids seen in this problem
     @Apache::bridgetask::instancelist=();      @Apache::bridgetask::instancelist=();
     # key of queud user data that we are currently grading      # key of queud user data that we are currently grading
     $Apache::bridgetask::queue_key='';      $Apache::bridgetask::queue_key='';
       undef(%dimension);
 }  }
   
 sub proctor_check_auth {  sub proctor_check_auth {
     my ($slot_name,$slot)=@_;      my ($slot_name,$slot,$type)=@_;
     my $user=$env{'form.proctorname'};      my $user=$env{'form.proctorname'};
     my $domain=$env{'form.proctordomain'};      my $domain=$env{'form.proctordomain'};
           
     my @allowed=split(",",$slot->{'proctor'});      my @allowed=split(",",$slot->{'proctor'});
     foreach my $possible (@allowed) {      foreach my $possible (@allowed) {
  my ($puser,$pdom)=(split('@',$possible));   my ($puser,$pdom)=(split(':',$possible));
  if ($puser eq $user && $pdom eq $domain) {   if ($puser eq $user && $pdom eq $domain) {
     my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);      my $authenticated=0;
     if ($authhost ne 'no_host') {      if ( $slot->{'secret'} =~ /\S/ &&
  my $version=   $env{'form.proctorpassword'} eq $slot->{'secret'} ) {
     $Apache::lonhomework::results{'resource.version'}=   $authenticated=1;
     ++$Apache::lonhomework::history{'resource.version'};      } else {
  $Apache::lonhomework::results{"resource.$version.checkedin"}=  
     $user.'@'.$domain;   my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
  $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=   if ($authhost ne 'no_host') {
     $slot_name;      $authenticated=1;
  foreach my $key (keys(%Apache::lonhomework::history)) {  
     if ($key=~/^resource\.0\./) {  
  $Apache::lonhomework::results{$key}='';  
     }  
  }   }
       }
       if ($authenticated) {
    &check_in($type,$user,$domain,$slot_name);
  return 1;   return 1;
     }      }
  }   }
Line 89  sub proctor_check_auth { Line 91  sub proctor_check_auth {
     return 0;      return 0;
 }  }
   
   sub check_in {
       my ($type,$user,$domain,$slot_name) = @_;
       my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
       if ( $useslots eq 'map_map') {
    &check_in_sequence($user,$domain,$slot_name);
       } else {
    &create_new_version($type,$user,$domain,$slot_name);
       }
       return 1;
   }
   
   sub check_in_sequence {
       my ($user,$domain,$slot_name) = @_;
       my $navmap = Apache::lonnavmaps::navmap->new();
       my ($symb) = &Apache::lonnet::whichuser();
       my ($map)  = &Apache::lonnet::decode_symb($symb);
       my @resources = 
    $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);
       my %old_history = %Apache::lonhomework::history;
       my %old_results = %Apache::lonhomework::results;
   
       foreach my $res (@resources) {
    &Apache::lonxml::debug("doing ".$res->src);
    &Apache::structuretags::initialize_storage($res->symb);
    my $type = ($res->is_task()) ? 'Task' : 'problem';
    &create_new_version($type,$user,$domain,$slot_name);
    &Apache::structuretags::finalize_storage($res->symb);
       }
       
       %Apache::lonhomework::history = %old_history;
       %Apache::lonhomework::results = %old_results;
   }
   
   sub create_new_version {
       my ($type,$user,$domain,$slot_name) = @_;
       
       my $id = '0';
       if ($type eq 'Task') {
    # increment version
    my $version=
       $Apache::lonhomework::history{'resource.0.version'};
    $version++;
    &Apache::lonxml::debug("Making version $version");
    #clean out all current results
    foreach my $key (keys(%Apache::lonhomework::history)) {
       if ($key=~/^resource\.0\./) {
    $Apache::lonhomework::results{$key}='';
       }
    }
   
    #setup new version and who did it
           $Apache::lonhomework::results{'resource.0.version'}=$version;
    $id = "$version.0";
    if (!defined($user) || !defined($domain)) {
       $user = $env{'user.name'};
       $domain = $env{'user.domain'};
    }
   
       } elsif ($type eq 'problem') {
    &Apache::lonxml::debug("authed $slot_name");
       }
       if (!defined($user) || !defined($domain)) {
    $user = $env{'user.name'};
    $domain = $env{'user.domain'};
       }
   
       $Apache::lonhomework::results{"resource.$id.checkedin"}=
    $user.':'.$domain;
   
       if (defined($slot_name)) {
    $Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
       $slot_name;
       }
   }
   
 sub get_version {  sub get_version {
     my ($version,$previous);      my ($version,$previous);
     if ($env{'form.previousversion'} &&       if ($env{'form.previousversion'} && 
  $env{'form.previousversion'} ne 'current' &&   $env{'form.previousversion'} ne 'current' &&
  defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {   defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) {
  $version=$env{'form.previousversion'};   $version=$env{'form.previousversion'};
  $previous=1;   $previous=1;
     } else {      } else {
  $version=$Apache::lonhomework::history{'resource.version'};   if (defined($Apache::lonhomework::results{'resource.0.version'})) {
       $version=$Apache::lonhomework::results{'resource.0.version'};
    } elsif (defined($Apache::lonhomework::history{'resource.0.version'})) {
       $version=$Apache::lonhomework::history{'resource.0.version'};
    }
  $previous=0;   $previous=0;
     }      }
     if (wantarray) {      if (wantarray) {
Line 109  sub get_version { Line 190  sub get_version {
 sub add_previous_version_button {  sub add_previous_version_button {
     my ($status)=@_;      my ($status)=@_;
     my $result;      my $result;
     if ($Apache::lonhomework::history{'resource.version'} eq '') {      if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
  return '';   return '';
     }      }
     if ($Apache::lonhomework::history{'resource.version'} < 2 &&      if ($Apache::lonhomework::history{'resource.0.version'} < 2 &&
  $status ne 'NEEDS_CHECKIN') {   $status ne 'NEEDS_CHECKIN') {
  return '';   return '';
     }      }
Line 123  sub add_previous_version_button { Line 204  sub add_previous_version_button {
     "</h3>\n";      "</h3>\n";
     }      }
     my @to_show;      my @to_show;
     foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {      foreach my $test_version (1..$Apache::lonhomework::history{'resource.0.version'}) {
  if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {   if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.0.status'})) {
     push(@to_show,$test_version);      push(@to_show,$test_version);
  }   }
     }      }
Line 132  sub add_previous_version_button { Line 213  sub add_previous_version_button {
  join("</option>\n<option>",@to_show).   join("</option>\n<option>",@to_show).
      "</option>\n";       "</option>\n";
     $list.='<option value="current">'.&mt('Current').'</option>';      $list.='<option value="current">'.&mt('Current').'</option>';
     $result.='<form name="getprevious" method="POST" action="';      $result.='<form name="getprevious" method="post" action="';
     my $uri=$env{'request.uri'};      my $uri=$env{'request.uri'};
     if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }      if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
     $result.=$uri.'">'.      $result.=$uri.'">'.
Line 144  sub add_previous_version_button { Line 225  sub add_previous_version_button {
 }  }
   
 sub add_grading_button {  sub add_grading_button {
     my (undef,$cid)=&Apache::lonxml::whichuser();      my (undef,$cid)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my %sections;      my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
     my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections);  
     my $size=5;      my $size=5;
     if (scalar(keys(%sections)) < 3) {      if (scalar(keys(%sections)) < 3) {
  $size=scalar(keys(%sections))+2;   $size=scalar(keys(%sections))+2;
     }      }
     my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";      my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
     $sec_select .= "<option value='all' selected='selected'>all</option>\n";      $sec_select .= "<option value='all' selected='selected'>all</option>\n";
     foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {      foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
  $sec_select .= "<option name=\"$sec\">$sec</option>\n";   $sec_select .= "<option value=\"$sec\">$sec</option>\n";
     }      }
     $sec_select .= "<option value='none'>none</option></select>\n";      $sec_select .= "<option value='none'>none</option></select>\n";
           
Line 165  sub add_grading_button { Line 246  sub add_grading_button {
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';      $result.='<input type="hidden" name="grade_target" value="webgrade" />';
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');   my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
  $result.='<p>Specify a section: '.$sec_select.'</p>';   $result.='<table><tr>';
  $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);   $result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';
    $result.='<td>'.' <input type="submit" name="reviewagrading" value="'.
       &mt("Select an entry from the grading queue:").'" /> ';
   
  $result.=' <input type="submit" name="reviewagrading" value="'.   $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";
     &mt("Select an entry from the grading queue").'" /> </p>'."\n";  
   
  ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');   ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
  $result.='<p>'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);   $result.='<tr><td>'.
  $result.=' <input type="submit" name="reviewasubmission" value="'.      ' <input type="submit" name="reviewasubmission" value="'.
     &mt("Select an entry from the review queue").'" /> </p>'."\n";      &mt("Select an entry from the review queue:").'" /> ';
  $result.=' <input type="submit" name="regradeasubmission" value="'.   $result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
     &mt("Select a user to regrade.").'" /> </p>'."\n";       $entries,$ready,$locks).'</td></tr>'."\n";
    $result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.
       &mt("List of user's grade status").'" /> </td></tr></table>'."\n";
    $result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.
       &mt("Regrade specific user:").'" />'."\n";
    $result.='<input type="text" size="12" name="gradinguser" />';
    $result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
        'gradingdomain');
    $result.=' '.
       &Apache::loncommon::selectstudent_link('gradesubmission',
      'gradinguser',
      'gradingdomain');
    $result.=&Apache::loncommon::studentbrowser_javascript();
    $result.= '</p>';
     }      }
     return $result;      return $result;
 }  }
Line 186  sub add_request_another_attempt_button { Line 281  sub add_request_another_attempt_button {
     if (!$text) { $text="Request another attempt"; }      if (!$text) { $text="Request another attempt"; }
     my $result;      my $result;
     my $symb=&Apache::lonnet::symbread();      my $symb=&Apache::lonnet::symbread();
       # not a slot access based resource
       my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
       if ($useslots =~ /^\s*no\s*$/i) {
    return '';
       }
   
     my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);      my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
     my $action='get_reservation';      my $action='get_reservation';
     if ($slot_name) {      if ($slot_name) {
Line 199  STUFF Line 300  STUFF
     }      }
           
     if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }      if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
     $symb=&Apache::lonnet::escape($symb);      $symb=&escape($symb);
     $result.='<form method="POST" action="/adm/slotrequest">'.      $result.='<form method="post" action="/adm/slotrequest">'.
  '<input type="hidden" name="symb" value="'.$symb.'" />'.   '<input type="hidden" name="symb" value="'.$symb.'" />'.
  '<input type="hidden" name="command" value="'.$action.'" />'.   '<input type="hidden" name="command" value="'.$action.'" />'.
  '<input type="submit" name="requestattempt" value="'.   '<input type="submit" name="requestattempt" value="'.
Line 222  sub preserve_grade_info { Line 323  sub preserve_grade_info {
 }  }
   
 sub style {  sub style {
     return (<<STYLE);      my ($target) = @_;
 <style type="text/css">      if ($target eq 'web'
 .fail, .pass, .neutral {   || $target eq 'webgrade') {
     position: relative;   return (<<STYLE);
     margin : 5px;  <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
     margin-bottom :10px;  
     padding : 4px;  
     padding-left : 75px;  
  border : thin solid;  
     font-weight : bolder;  
     font-size: smaller;  
     font-family: Arial;  
     background-color : rgb(255,240,225);  
 }  
   
 .fail h4, .pass h4 {  
  position:absolute;  
  left: -4px;  
  top: -8px;  
  padding:2px;  
  margin:0;  
  background-color : rgb(255,240,225);  
  border : thin solid;  
 }  
   
 .fail {  
  color: red;  
 }  
   
 .pass {  
     color : green;  
 }  
   
 .neutral {  
  color : blue;  
 }  
   
 .question {  
  border : thin solid black;  
  padding : 4px;  
  margin-bottom : 1em;  
 }  
   
 .grade {  
  font-size: x-large;  
  font-family: Arial;  
  position:absolute;  
  left: 5px;  
  top: -5px;  
  width: 70px;  
 }  
   
 div#feedback h1 {  
     color : inherit;  
 }  
 </style>  
 STYLE  STYLE
       }
       return;
 }  }
   
 sub show_task {  sub show_task {
Line 291  sub show_task { Line 342  sub show_task {
        ( $status eq 'NOT_IN_A_SLOT') ||         ( $status eq 'NOT_IN_A_SLOT') ||
        ( $status eq 'NEEDS_CHECKIN') ||         ( $status eq 'NEEDS_CHECKIN') ||
        ( $status eq 'WAITING_FOR_GRADE') ||         ( $status eq 'WAITING_FOR_GRADE') ||
        ( $status eq 'INVALID_ACCESS') )) {         ( $status eq 'INVALID_ACCESS') ||
          ( &get_version() eq ''))) {
  return 0;   return 0;
     }      }
     if ($env{'form.donescreen'}) { return 0; }      if ($env{'form.donescreen'}) { return 0; }
     return 1;      return 1;
 }  }
   
   my @delay;
   sub nest { 
       if (@delay) {
    return $delay[-1];
       } else {
    return;
       }
   }
   
   sub nested_parse {
       my ($str,$env,$args) = @_;
       my @old_env = @Apache::scripttag::parser_env;
       @Apache::scripttag::parser_env = @$env;
       if (exists($args->{'set_dim_id'})) {
    &enable_dimension_parsing($args->{'set_dim_id'});
       }
       push(@delay,(($args->{'delayed_dim_results'})? 1 : 0));
       my $result = &Apache::scripttag::xmlparse($$str);
       pop(@delay);
       if (exists($args->{'set_dim_id'})) {
    &disable_dimension_parsing();
       }
       @Apache::scripttag::parser_env = @old_env;
       if ($args->{'delayed_dim_results'}) {
    my $dim = &get_dim_id();
    &Apache::lonxml::debug(" tossing out $result ");
    &Apache::lonxml::debug(" usining out $dim 's  ". $dimension{$dim}{'result'});
    return $dimension{$dim}{'result'};
       }
       return $result;
   }
   
 sub internal_location {  sub internal_location {
     my ($id)=@_;      my ($id)=@_;
     return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';      return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
 }  }
   
 sub submission_time_stamp {  sub submission_time_stamp {
     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $submissiontime;      my $submissiontime;
     my $version=$Apache::lonhomework::history{'resource.version'};      my $version=$Apache::lonhomework::history{'resource.0.version'};
     for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {      for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
  if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {   if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})
       && defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.tries'})) {
     $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};      $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
       last;
  }   }
     }      }
     my $result;      my $result;
     if ($submissiontime) {      if ($submissiontime) {
  my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};   my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.0.checkedin.slot'};
  my %slot=&Apache::lonnet::get_slot($slot_name);   my %slot=&Apache::lonnet::get_slot($slot_name);
  my $diff = $slot{'endtime'} - $submissiontime;   my $diff = $slot{'endtime'} - $submissiontime;
  my ($color,$when)=('red','after');   my ($color,$when)=('#FF6666','after');
  if ($diff > 0) { ($color,$when)=('green','before'); }   if ($diff > 0) { ($color,$when)=('#336600','before'); }
  my $info;   my $info;
    $diff = abs($diff);
  if ($diff%60) { $info=($diff%60).' seconds'; }   if ($diff%60) { $info=($diff%60).' seconds'; }
  $diff=int($diff/60);   $diff=int($diff/60);
  if ($diff%60) { $info=($diff%60).' minutes '.$info; }   if ($diff%60) { $info=($diff%60).' minutes '.$info; }
  $diff=int($diff/60);   $diff=int($diff/60);
  if ($diff) {    $info=$diff.' hours '.$info; }   if ($diff) {    $info=$diff.' hours '.$info; }
  $result='<p><font color="'.$color.'">'.   $result='<p><font color="'.$color.'">'.
     &mt('Student submitted [_1] [_2] the deadline.       &mt('Student submitted [_1] [_2] the deadline. '.
                  (Submission was at [_3], end of period was [_4].)',   '(Submission was at [_3], end of period was [_4].)',
  $info,$when,scalar(localtime($submissiontime)),   $info,$when,
  scalar(localtime($slot{'endtime'}))).   &Apache::lonlocal::locallocaltime($submissiontime),
    &Apache::lonlocal::locallocaltime($slot{'endtime'})).
  '</font></p>';   '</font></p>';
     }      }
     return $result;      return $result;
 }  }
   
   sub file_list {
       my ($files,$uname,$udom) = @_;
       if (!defined($uname) || !defined($udom)) {
    (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser();
       }
       my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
   
       my $file_list="<ul class=\"LC_GRADING_handininfo\">\n";
       foreach my $partial_file (split(',',$files)) {
    my $file=$file_url.$partial_file;
    $file=~s|/+|/|g;
    &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
    $file_list.='<li><span style="white-space: nowrap;"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
       &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
       '</a></span></li>'."\n";
       }
       $file_list.="</ul>\n";
       return $file_list;
   }
   
   sub grade_mode {
       if ($env{'form.regrade'} || $env{'form.regradeaspecificsubmission'}) {
    return 'regrade';
       }
       return 'queue_grade';
   }
   
   sub webgrade_standard_info {
       my ($version)=&get_version();
   
       my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
   
       my %lt=('done'   => 'Next Item',
       'stop'   => 'Quit Grading',
       'fail'   => 'Fail Rest',
       'cancel' => 'Cancel',
       );
       %lt=&Apache::lonlocal::texthash(%lt);
   
       my $result=<<INFO;
     <div class="LC_GRADING_maincontrols">
   INFO
   
       if (&grade_mode() eq 'regrade') {
    $result.=<<INFO;
       <input type="submit" name="cancel" value="$lt{'cancel'}" />
   INFO
       }
   
       $result.=<<INFO;
       <input type="submit" name="next" value="$lt{'done'}" />
       <input type="submit" name="stop" value="$lt{'stop'}" />
       <input type="button" name="fail" value="$lt{'fail'}" 
              onclick="javascript:onFailRest()" />
     </div>
     $file_list
   INFO
       return $result;
   }
   
   sub done_screen {
       my ($version) = @_;
       my $title=&Apache::lonnet::gettitle();
       my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
       my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
       my $files = '<ul>';
       my $msg;
       foreach my $file (@files) {
    my $url="/uploaded/$domain/$user/portfolio$file";
    if (! &Apache::lonnet::stat_file($url)) {
       $file = &mt('<span class="LC_error"> Nonexistent file:</span> '.
    '<span class="LC_filename">[_1]</span>',$file);
       $msg .= "<p>Submitted non-existant file $file</p>\n";
    } else {
       $file = '<span class="LC_filename">'.$file.'</span>';
       $msg .= "<p>Submitted file $file</p>\n";
    }
    $files .= '<li>'.$file.'</li>';
       }
       $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;
   <h2>$title</h2>
   <p> Files submitted: $files </p>
   <p> You are now done with this Bridge Task </p>
   <hr />
   <p> <a href="/adm/logout">Logout</a> </p>
   <p> <a href="/adm/roles">Change to a different course</a> </p>
   $message_status
   $comment_status
   DONESCREEN
   
   }
   
 sub start_Task {  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      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::initialize_storage();   &Apache::structuretags::initialize_storage();
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   &Apache::lonhomework::showhash(%Apache::lonhomework::history);
    if ($env{'request.state'} eq 'construct') {
       &Apache::structuretags::setup_rndseed($safeeval);
    }
     }       } 
   
     $Apache::lonhomework::parsing_a_task=1;      $Apache::lonhomework::parsing_a_task=1;
     #should get back a <html> or the neccesary stuff to start XML/MathML  
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=      my $name;
  &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);      if ($target eq 'web' || $target eq 'webgrade') {
        $name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
     if ($target eq 'web') {      }
  if ($Apache::lonhomework::modifygrades) {  
     $body_tag_start.='<form name="gradesubmission" method="POST" action="';      my ($result,$form_tag_start);
       if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
    || $target eq 'edit') {
    ($result,$form_tag_start) =
       &Apache::structuretags::page_start($target,$token,$tagstack,
          $parstack,$parser,$safeeval,
          $name,&style($target));
    $result .= '<div class="LC_task">'."\n";
       }
   
       if ($target eq 'web' && $env{'request.state'} ne 'construct') {
    if ($Apache::lonhomework::queuegrade
       || $Apache::lonhomework::modifygrades) {
       $result.='<form name="gradesubmission" method="post" action="';
     my $uri=$env{'request.uri'};      my $uri=$env{'request.uri'};
     if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }      if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
     $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";      $result.=$uri.'">'.&add_grading_button()."</form>";
     my $symb=&Apache::lonnet::symbread();      my $symb=&Apache::lonnet::symbread();
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  $body_tag_start.='<form method="POST" action="/adm/slotrequest">'.   $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
     '<input type="hidden" name="symb" value="'.$symb.'" />'.      '<input type="hidden" name="symb" value="'.$symb.'" />'.
     '<input type="hidden" name="command" value="showslots" />'.      '<input type="hidden" name="command" value="showslots" />'.
     '<input type="submit" name="requestattempt" value="'.      '<input type="submit" name="requestattempt" value="'.
     &mt('Show Slot list').'" />'.      &mt('Show Slot list').'" />'.
     '</form>';      '</form>';
    my $target_id = 
       &Apache::lonstathelpers::make_target_id({symb => $symb,
        part => '0'});
    $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
       '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
       '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
       '<input type="submit" name="grading" value="'.
       &mt('Show Grading Status').'" />'.
       '</form>';
     }      }
  }   }
     }      }
     if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||      if ($target eq 'web' && $env{'request.state'} eq 'construct') {
  $target eq 'tex') {   $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
       }
       if ($target eq 'web' 
    || ($target eq 'grade' && !$env{'form.webgrade'}) 
    || $target eq 'answer' 
    || $target eq 'tex') {
  my ($version,$previous)=&get_version();   my ($version,$previous)=&get_version();
  ($status,$accessmsg,my $slot_name,$slot) =    ($status,$accessmsg,my $slot_name,$slot) = 
     &Apache::lonhomework::check_task_access('0');      &Apache::lonhomework::check_slot_access('0','Task');
    if ($status eq 'CAN_ANSWER' && $version eq '') {
       # CAN_ANSWER mode, and no current version, unproctored access
       # thus self-checkedin
       &check_in('Task',undef,undef,$slot_name);
       &add_to_queue('gradingqueue',{'type' => 'Task',
     'time' => time,
     'slot' => $slot_name});
       ($version,$previous)=&get_version();
    }
   
  push(@Apache::inputtags::status,$status);   push(@Apache::inputtags::status,$status);
  $Apache::inputtags::slot_name=$slot_name;   $Apache::inputtags::slot_name=$slot_name;
  my $expression='$external::datestatus="'.$status.'";';   my $expression='$external::datestatus="'.$status.'";';
  $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';   $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
  &Apache::run::run($expression,$safeeval);   &Apache::run::run($expression,$safeeval);
  &Apache::lonxml::debug("Got $status");   &Apache::lonxml::debug("Got $status");
  $body_tag_start.=&add_previous_version_button($status);   $result.=&add_previous_version_button($status);
  if (!&show_task($status,$previous)) {   if (!&show_task($status,$previous)) {
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>'.$body_tag_start;   if ($env{'request.state'} eq 'construct') {
       $result.=$form_tag_start;
    }
  my $msg;   my $msg;
  if ($status eq 'UNAVAILABLE') {   if ($status eq 'UNAVAILABLE') {
     $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';      $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
Line 394  sub start_Task { Line 637  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'}) {
     my $title=&Apache::lonnet::gettitle();      $result .= &done_screen($version);
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});  
     my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';  
     $result.=<<DONESCREEN;  
 <h2>$title</h2>  
 <p> Files submitted: $files </p>  
 <p> You are now done with this Bridge Task </p>  
 <hr />  
 <p> <a href="/adm/logout">Logout</a> </p>  
 <p> <a href="/adm/roles">Change to a different course</a> </p>  
 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 421  DONESCREEN Line 654  DONESCREEN
  }   }
     } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {      } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
  if ($status eq 'NEEDS_CHECKIN') {   if ($status eq 'NEEDS_CHECKIN') {
     &proctor_check_auth($slot_name,$slot);      if(&proctor_check_auth($slot_name,$slot,'Task')
          && defined($Apache::inputtags::slot_name)) {
    my $result=
       &add_to_queue('gradingqueue',
     {'type' => 'Task',
      'time' => time,
      'slot' => 
          $Apache::inputtags::slot_name});
    &Apache::lonxml::debug("add_to_queue said $result");
       }
  }   }
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);  
     $result.="$head_tag_start<title>$name</title></head>  
               $body_tag_start \n".&style();  
       
     $result.=&preserve_grade_info();      $result.=&preserve_grade_info();
     $result.=&internal_location();      $result.=&internal_location();
     $result.=$form_tag_start.      $result.=$form_tag_start.
Line 439  DONESCREEN Line 678  DONESCREEN
       $target eq 'webgrade') {        $target eq 'webgrade') {
  my $webgrade='yes';   my $webgrade='yes';
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.=$head_tag_start.$body_tag_start;      $result.= "\n".'<div class="LC_GRADING_task">'."\n".
    '<script type="text/javascript" 
                            src="/res/adm/includes/task_grading.js"></script>';
     #$result.='<br />Review'.&show_queue('reviewqueue');      #$result.='<br />Review'.&show_queue('reviewqueue');
     #$result.='<br />Grade'.&show_queue('gradingqueue');      #$result.='<br />Grade'.&show_queue('gradingqueue');
  }   }
Line 448  DONESCREEN Line 689  DONESCREEN
         #       Hrrm, vaildation pass should perhaps say 'not_locked'          #       Hrrm, vaildation pass should perhaps say 'not_locked'
         #       perhaps do a search if there is a key that is mine and if          #       perhaps do a search if there is a key that is mine and if
         #       there isn't reshow the queue....          #       there isn't reshow the queue....
  my ($todo,$status_code)=&get_key_todo($target);   my ($todo,$status_code,$msg)=&get_key_todo($target);
   
  if ($todo) {   if ($todo) {
     &setup_env_for_other_user($todo,$safeeval);      &setup_env_for_other_user($todo,$safeeval);
Line 457  DONESCREEN Line 698  DONESCREEN
  &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';   &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
     $form_tag_start.=      $form_tag_start.=
  '<input type="hidden" name="gradingkey" value="'.   '<input type="hidden" name="gradingkey" value="'.
  &Apache::lonnet::escape($todo).'" />';   &escape($todo).'" />';
     $Apache::bridgetask::queue_key=$todo;      $Apache::bridgetask::queue_key=$todo;
     &Apache::structuretags::initialize_storage();      &Apache::structuretags::initialize_storage();
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);      &Apache::lonhomework::showhash(%Apache::lonhomework::history);
     if ($target eq 'webgrade') {      if ($target eq 'webgrade' && $status_code eq 'selected') {
  #$result.='<br />After -'.&show_queue($env{'form.queue'});   $form_tag_start.=
  $result.="\n".'<table width="100%" style="width:100%" border="1">';      '<input type="hidden" name="queuemode" value="selected" />';
  if ($status_code eq 'selected') {  
     $form_tag_start.=  
  '<input type="hidden" name="queuemode" value="selected" />';  
  }  
     }      }
  } else {   } else {
     if ($target eq 'webgrade') {      if ($target eq 'webgrade') {
  $result.="\n";   $result.="\n";
    my $back='<p><a href="/adm/flip?postdata=return:">'.
       &mt('Return to resource').'</a></p>';
  if      ($status_code eq 'stop') {   if      ($status_code eq 'stop') {
     $result.='<b>'.&mt("Stopped grading.").'</b>';      $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
    } elsif ($status_code eq 'cancel') {
       $result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;
    } elsif ($status_code eq 'never_versioned') {
       $result.='<b>'.
    &mt("Requested user has never accessed the task.").
    '</b>'.$back;
    } elsif ($status_code =~ /still_open:(.*)/) {
       my $date = &Apache::lonlocal::locallocaltime($1);
       $result.='<b>'.
    &mt("Task is still open, will close at [_1].",$date).
    '</b>'.$back;
  } elsif ($status_code eq 'lock_failed') {   } elsif ($status_code eq 'lock_failed') {
     $result.='<b>'.&mt("Failed to lock the request record.").'</b>';      $result.='<b>'.&mt("Failed to lock the requested record.")
    .'</b>'.$back;
  } elsif ($status_code eq 'unlock') {   } elsif ($status_code eq 'unlock') {
     $result.='<b>'.&mt("Unlocked the requested record.").'</b>';      $result.='<b>'.&mt("Unlocked the requested record.")
    .'</b>'.$back;
     $result.=&show_queue($env{'form.queue'},1);      $result.=&show_queue($env{'form.queue'},1);
  } elsif ($status_code eq 'show_list') {   } elsif ($status_code eq 'show_list') {
     $result.=&show_queue($env{'form.queue'},1);      $result.=&show_queue($env{'form.queue'},1);
  } elsif ($status_code eq 'select_user') {   } elsif ($status_code eq 'select_user') {
     $result.=&select_user();      $result.=&select_user();
    } elsif ($status_code eq 'unable') {
       $result.='<b>'.&mt("Unable to aqcuire a user to grade.").'</b>'.$back;
    } elsif ($status_code eq 'not_allowed') {
       $result.='<b>'.&mt('Not allowed to grade the requested user.').' '.$msg.'</b>'.$back;
  } else {   } else {
     $result.='<b>'.&mt("No user to be graded.").'</b>';      $result.='<b>'.&mt("No user to be graded.").'</b>'.$back;
  }   }
     }      }
     $webgrade='no';      $webgrade='no';
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);   }
    if (!$todo || $env{'form.cancel'}) {
       my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
  }   }
  if ($target eq 'webgrade' && defined($env{'form.queue'})) {   if ($target eq 'webgrade' && defined($env{'form.queue'})) {
     if ($webgrade eq 'yes') {      if ($webgrade eq 'yes') {
Line 511  DONESCREEN Line 769  DONESCREEN
                                value="'.$sec.'" />';                                 value="'.$sec.'" />';
  }   }
     }      }
       if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
    }
    if ($target eq 'webgrade') {
       $result.="\n".'<div id="LC_GRADING_criterialist">';
  }   }
       } elsif ($target eq 'edit') {
    $result.=$form_tag_start.
       &Apache::structuretags::problem_edit_header();
    $Apache::lonxml::warnings_error_header=
       &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
    my $temp=&Apache::edit::insertlist($target,$token);
    $result.=$temp;
     } else {      } else {
  # page_start returned a starting result, delete it if we don't need it   # page_start returned a starting result, delete it if we don't need it
  $result = '';   $result = '';
Line 519  DONESCREEN Line 788  DONESCREEN
     return $result;      return $result;
 }  }
   
   sub get_task_end_time {
       my ($queue_entry,$symb,$udom,$uname) = @_;
   
       my $end_time;
       if (my $slot = &slotted_access($queue_entry)) {
    my %slot_data=&Apache::lonnet::get_slot($slot);
    $end_time = $slot_data{'endtime'};
       } else {
    $end_time = &Apache::lonhomework::due_date('0',$symb,
      $udom,$uname);
       }
       return $end_time;
   }
   
 sub get_key_todo {  sub get_key_todo {
     my ($target)=@_;      my ($target)=@_;
     my $todo;      my $todo;
Line 541  sub get_key_todo { Line 824  sub get_key_todo {
  return (undef,'select_user');   return (undef,'select_user');
     }      }
   
   
       my $me=$env{'user.name'}.':'.$env{'user.domain'};
   
       #need to try both queues..
       if (defined($env{'form.regradeaspecificsubmission'}) &&
    defined($env{'form.gradinguser'})               &&
    defined($env{'form.gradingdomain'})               ) {
    my ($symb,$cid)=&Apache::lonnet::whichuser();
    my $cnum  = $env{'course.'.$cid.'.num'};
    my $cdom  = $env{'course.'.$cid.'.domain'};
    my $uname = $env{'form.gradinguser'};
    my $udom  = $env{'form.gradingdomain'};
   
    my $gradingkey=&encode_queue_key($symb,$udom,$uname);
   
    my $queue;
   
    if      (&in_queue('gradingqueue',$symb,$cdom,$cnum,$udom,$uname)) {
       $env{'form.queue'} = $queue = 'gradingqueue';
    } elsif (&in_queue('reviewqueue' ,$symb,$cdom,$cnum,$udom,$uname)) {
       $env{'form.queue'} = $queue = 'reviewqueue';
    }
   
    if (!$queue) {
       $env{'form.queue'} = $queue = 'none';
       #not queued so doing either a re or pre grade
       my %status = &Apache::lonnet::restore($symb,$cid,$udom,$uname);
       if ($status{'resource.0.version'} < 1) {
    return (undef,'never_versioned');
       }
       return ($gradingkey);
    }
   
    if ($queue) {
       my $queue_entry = &get_queue_data($queue,$udom,$uname);
   
       my $end_time = &get_task_end_time($queue_entry,$symb,
         $udom,$uname);
       if ($end_time > time) {
    return (undef,"still_open:$end_time");
       }
    }
   
    my $who=&queue_key_locked($queue,$gradingkey);
    if ($who eq $me) {
       #already have the lock
       $env{'form.gradingkey'}=&escape($gradingkey);
       &Apache::lonxml::debug("already locked");
       return ($gradingkey);
    }
   
    if (!defined($who)) {
       if (&lock_key($queue,$gradingkey)) {
    &Apache::lonxml::debug("newly locked");
    return ($gradingkey);
       } else {
    return (undef,'lock_failed');
       }
    }
   
    #otherwise (defined($who) && $who ne $me) some else has it...
    return (undef,'not_allowed',
    &mt('Another user ([_1]) currently has the record for [_2] locked.',
       $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
       }
   
   
     my $queue=$env{'form.queue'};      my $queue=$env{'form.queue'};
   
     if (!defined($queue)) {      if (!defined($queue)) {
  $env{'form.queue'}=$queue='gradingqueue';   $env{'form.queue'}=$queue='gradingqueue';
     }      }
   
     my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});      my $gradingkey=&unescape($env{'form.gradingkey'});
   
     if ($env{'form.queue'} eq 'none') {      if ($env{'form.queue'} eq 'none') {
  if (defined($env{'form.gradingkey'})) {   if (defined($env{'form.gradingkey'})) {
     if ($target eq 'webgrade') {      if ($target eq 'webgrade') {
  if ($env{'form.stop'}) {   if ($env{'form.stop'}) {
     return (undef,'stop');      return (undef,'stop');
    } elsif ($env{'form.cancel'}) {
       return (undef,'cancel');
  } elsif ($env{'form.next'}) {   } elsif ($env{'form.next'}) {
     return (undef,'select_user');      return (undef,'select_user');
  }   }
Line 568  sub get_key_todo { Line 920  sub get_key_todo {
  && $env{'form.queuemode'} eq 'selected') {   && $env{'form.queuemode'} eq 'selected') {
   
  my $who=&queue_key_locked($queue,$gradingkey);   my $who=&queue_key_locked($queue,$gradingkey);
  my $me=$env{'user.name'}.'@'.$env{'user.domain'};  
  if ($who eq $me) {   if ($who eq $me) {
     &Apache::lonxml::debug("Found a key was given to me");      &Apache::lonxml::debug("Found a key was given to me");
     return ($gradingkey,'selected');      return ($gradingkey,'selected');
Line 600  sub get_key_todo { Line 951  sub get_key_todo {
   
     if ($env{'form.queuemode'} ne 'selected') {      if ($env{'form.queuemode'} ne 'selected') {
  # don't get something new from the queue if they hit the stop button   # don't get something new from the queue if they hit the stop button
     if (!($env{'form.stop'} && $target eq 'webgrade')       if (!(($env{'form.cancel'} || $env{'form.stop'}) 
         && $target eq 'webgrade') 
     && !$env{'form.gradingaction'}) {      && !$env{'form.gradingaction'}) {
     &Apache::lonxml::debug("Getting anew $queue");      &Apache::lonxml::debug("Getting anew $queue");
     return (&get_from_queue($queue));      return (&get_from_queue($queue));
Line 611  sub get_key_todo { Line 963  sub get_key_todo {
     return (undef,undef)      return (undef,undef)
 }  }
   
   sub minimize_storage {
       foreach my $key (keys(%Apache::lonhomework::results)) {
    if ($key =~ /regrader$/) { next; }
    if ($Apache::lonhomework::results{$key} eq
       $Apache::lonhomework::history{$key}) {
       delete($Apache::lonhomework::results{$key});
    }
       }
   }
   
 sub end_Task {  sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';      my $result='';
Line 618  sub end_Task { Line 980  sub end_Task {
     my ($version,$previous)=&get_version();      my ($version,$previous)=&get_version();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  if (   if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||  
     ($target eq 'answer') || ($target eq 'tex')  
    ) {  
     if ($target eq 'web') {      if ($target eq 'web') {
  if (&show_task($status,$previous)) {   if (&show_task($status,$previous)) {
     $result.=&Apache::lonxml::endredirection();      $result.=&Apache::lonxml::endredirection();
Line 636  sub end_Task { Line 995  sub end_Task {
 <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>  <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
 <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').  <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
   "</table>";    "</table>";
    }
    if (!$previous && $status ne 'SHOW_ANSWER' &&
       &show_task($status,$previous)) {
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
     $result.='</form>';      $result.='</form>';
       my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
     $result.=<<DONEBUTTON;      $result.=<<DONEBUTTON;
 <form method="POST">  <form name="done" method="post" action="$action">
    <input type="hidden" name="donescreen" value="1" />     <input type="hidden" name="donescreen" value="1" />
    <input type="submit" value="Done" />     <input type="submit" value="Done" />
 </form>  </form>
 DONEBUTTON  DONEBUTTON
  }                  }
  if (&show_task($status,$previous) &&   if (&show_task($status,$previous) &&
     $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {      $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
     my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};      my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle();
     my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);  
     my $start_time=  
  &Apache::lonlocal::locallocaltime($slot{'starttime'});  
   
     my $status;      my $start_time;
     $status.="\n<div class='$bt_status'>\n";  
       my $slot_name=
    $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
       if ($slot_name) {
    my %slot=&Apache::lonnet::get_slot($slot_name);
   
    $start_time=$slot{'starttime'}
       } else {
    $start_time= 
       &Apache::lonnet::EXT('resource.0.opendate');
       }
       $start_time=&Apache::lonlocal::locallocaltime($start_time);
   
       my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
           
     if ($bt_status eq 'pass')  {      if ($bt_status eq 'pass')  {
  $status.='<h2>You passed the '.$title.' given on '.   $status.='<h2>You passed the '.$title.' given on '.
     $start_time.'.</h2>';      $start_time.'</h2>';
     }      }
     if ($bt_status eq 'fail')  {      if ($bt_status eq 'fail')  {
  $status.='<h2>You did not pass the '.$title.' given on '.   $status.='<h2>You did not pass the '.$title.' given on '.
     $start_time.'.</h2>';      $start_time.'</h2>';
  if (!$previous) {   if (!$previous) {
     $status.=&add_request_another_attempt_button();      $status.=&add_request_another_attempt_button();
  }   }
Line 670  DONEBUTTON Line 1043  DONEBUTTON
     my $man_count=0;      my $man_count=0;
     my $opt_count=0;      my $opt_count=0;
     my $opt_passed=0;      my $opt_passed=0;
     foreach my $dim_id (@Apache::bridgetask::dimensionlist) {      foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) {
  if ($Apache::bridgetask::dimensionmandatory{$dim_id}   if ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}
     eq 'N') {      eq 'N') {
     $opt_count++;      $opt_count++;
     if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {      if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') {
  $opt_passed++;   $opt_passed++;
     }      }
  } else {   } else {
     $man_count++;      $man_count++;
  }   }
     }      }
       
     my $opt_req=&Apache::lonxml::get_param('OptionalRequired',      my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
  $parstack,$safeeval);   $parstack,$safeeval);
     if ($opt_req !~ /\S/) { $opt_req='0'; }      if ($opt_req !~ /\S/) { $opt_req='0'; }
     $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n";      $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."</p></div>\n";
   
     my $internal_location=&internal_location();      my $internal_location=&internal_location();
     $result=~s/\Q$internal_location\E/$status/;      $result=~s/\Q$internal_location\E/$status/;
  }   }
     }    $result.="\n</div>\n".
     if ($target eq 'web' || $target eq 'webgrade') {      &Apache::loncommon::end_page({'discussion' => 1});
  $result.=&Apache::lonxml::xmlend().'</html>';  
     }      }
  }   }
   
    my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
    my %queue_data = ('type' => 'Task',
     'time' => time,);
    if (defined($Apache::inputtags::slot_name)) {
       $queue_data{'slot'} = $Apache::inputtags::slot_name;
    } elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) {
       $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
    }
   
   
  if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {   if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
     my $award='SUBMITTED';      my $award='SUBMITTED';
     &Apache::essayresponse::file_submission("$version.0",'bridgetask',      &Apache::essayresponse::file_submission("$version.0",'bridgetask',
Line 711  DONEBUTTON Line 1095  DONEBUTTON
     $Apache::lonhomework::results{"resource.$version.0.submission"}='';      $Apache::lonhomework::results{"resource.$version.0.submission"}='';
     } else {      } else {
  delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});   delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
    $award = '';
     }      }
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
     if ($award eq 'SUBMITTED') {      if ($award eq 'SUBMITTED') {
  &add_to_queue('gradingqueue',$Apache::inputtags::slot_name);   &add_to_queue('gradingqueue',\%queue_data);
     }      }
  }   }
  if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {   if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' 
       && exists($env{'form.cancel'})) {
       &check_queue_unlock($env{'form.queue'});
       &Apache::lonxml::debug(" cancelled grading .".$env{'form.queue'});
    } elsif ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' 
    && !exists($env{'form.cancel'})) {
     my $optional_required=      my $optional_required=
  &Apache::lonxml::get_param('OptionalRequired',$parstack,   &Apache::lonxml::get_param('OptionalRequired',$parstack,
    $safeeval);     $safeeval);
Line 727  DONEBUTTON Line 1117  DONEBUTTON
     my $ungraded=0;      my $ungraded=0;
     my $review=0;         my $review=0;   
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     foreach my $dim_id (@Apache::bridgetask::dimensionlist) {      foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) {
  my $status=   my $status=
     $Apache::lonhomework::results{"resource.$version.$dim_id.status"};      $Apache::lonhomework::results{"resource.$version.0.$dim.status"};
  my $mandatory=   my $mandatory=
     ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');      ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N');
  if ($status eq 'pass') {   if ($status eq 'pass') {
     if (!$mandatory) { $optional_passed++; }      if (!$mandatory) { $optional_passed++; }
  } elsif ($status eq 'fail') {   } elsif ($status eq 'fail') {
Line 747  DONEBUTTON Line 1137  DONEBUTTON
     if ($optional_passed < $optional_required) {      if ($optional_passed < $optional_required) {
  $mandatory_failed++;   $mandatory_failed++;
     }      }
     &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");      &Apache::lonxml::debug("all dim ".join(':',keys(%Apache::bridgetask::top_dimensionlist))."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
     $Apache::lonhomework::results{'resource.grader'}=      $Apache::lonhomework::results{'resource.0.regrader'}=
  $env{'user.name'}.'@'.$env{'user.domain'};   $env{'user.name'}.':'.$env{'user.domain'};
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{"resource.$version.status"}='review';   $Apache::lonhomework::results{"resource.$version.0.status"}='review';
  if ($env{'form.queue'} eq 'reviewqueue') {  
     &check_queue_unlock($env{'form.queue'});  
     &Apache::lonxml::debug(" still needs review not changing status.");  
  } else {  
     &move_between_queues($env{'form.queue'},'reviewqueue');  
  }  
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$version.status"}='ungraded';   $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
  if ($env{'form.queue'} eq 'reviewqueue' ||  
     $env{'form.queue'} eq 'none' ) {  
     &Apache::lonxml::debug("moving back.");  
     &move_between_queues($env{'form.queue'},'gradingqueue');  
  } else {  
     &check_queue_unlock($env{'form.queue'});  
  }  
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{"resource.$version.status"}='fail';   $Apache::lonhomework::results{"resource.$version.0.status"}='fail';
  $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
  $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';   $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
  $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';   $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
  &remove_from_queue($env{'form.queue'});    my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();  
   
  if ($env{'form.regrade'} ne 'yes') {   if ($env{'form.regrade'} ne 'yes') {
     $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=      $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
Line 786  DONEBUTTON Line 1161  DONEBUTTON
        ["$version.0.bridgetask"]);         ["$version.0.bridgetask"]);
  }   }
     } else {      } else {
  $Apache::lonhomework::results{"resource.$version.status"}='pass';   $Apache::lonhomework::results{"resource.$version.0.status"}='pass';
  $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
  $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';   $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
  $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';   $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
  &remove_from_queue($env{'form.queue'});   my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();  
  if ($env{'form.regrade'} ne 'yes') {   if ($env{'form.regrade'} ne 'yes') {
     $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=      $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
  $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};   $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
Line 803  DONEBUTTON Line 1176  DONEBUTTON
        ["$version.0.bridgetask"]);         ["$version.0.bridgetask"]);
  }   }
     }      }
     $Apache::lonhomework::results{"resource.status"}=      $Apache::lonhomework::results{"resource.0.status"}=
  $Apache::lonhomework::results{"resource.$version.status"};   $Apache::lonhomework::results{"resource.$version.0.status"};
     if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {      if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
  $Apache::lonhomework::results{"resource.0.award"}=   $Apache::lonhomework::results{"resource.0.award"}=
     $Apache::lonhomework::results{"resource.$version.0.award"};      $Apache::lonhomework::results{"resource.$version.0.award"};
Line 813  DONEBUTTON Line 1186  DONEBUTTON
  $Apache::lonhomework::results{"resource.0.solved"}=   $Apache::lonhomework::results{"resource.0.solved"}=
     $Apache::lonhomework::results{"resource.$version.0.solved"};      $Apache::lonhomework::results{"resource.$version.0.solved"};
     }      }
       &minimize_storage();
       &Apache::structuretags::finalize_storage();
       
       # data stored, now handle queue
       if ($review) {
    if ($env{'form.queue'} eq 'reviewqueue') {
       &check_queue_unlock($env{'form.queue'});
       &Apache::lonxml::debug(" still needs review not changing status.");
    } else {
       if ($env{'form.queue'} ne 'none') {
    &move_between_queues($env{'form.queue'},'reviewqueue');
       } else {
    &add_to_queue('reviewqueue',\%queue_data);
       }
    }
       } elsif ($ungraded) {
    if ($env{'form.queue'} eq 'reviewqueue') {
       &Apache::lonxml::debug("moving back.");
       &move_between_queues($env{'form.queue'},
    'gradingqueue');
    } elsif ($env{'form.queue'} eq 'none' ) {
       &add_to_queue('gradingqueue',\%queue_data);
    } else {
       &check_queue_unlock($env{'form.queue'});
    }
       } elsif ($mandatory_failed) {
    &remove_from_queue($env{'form.queue'}); 
       } else {
    &remove_from_queue($env{'form.queue'});
       }
    }
    if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
       # instance generation occured and hasn't yet been stored
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="</table>\n<hr />";   $result.="</div>";
  #$result.='<input type="submit" name="next" value="'.   #$result.='<input type="submit" name="next" value="'.
  #    &mt('Save &amp; Next').'" /> ';   #    &mt('Save &amp; Next').'" /> ';
  #$result.='<input type="submit" name="end" value="'.   #$result.='<input type="submit" name="end" value="'.
Line 825  DONEBUTTON Line 1231  DONEBUTTON
  #    &mt('Throw Away &amp; Stop Grading').'" /> ';   #    &mt('Throw Away &amp; Stop Grading').'" /> ';
  #$result.='<input type="submit" name="save" value="'.   #$result.='<input type="submit" name="save" value="'.
  #    &mt('Save Partial Grade and Continue Grading').'" /> ';   #    &mt('Save Partial Grade and Continue Grading').'" /> ';
  $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';   $result.='</form>'."\n</div>\n</div>\n".
       &Apache::loncommon::end_page();
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.='<parameter part="0" package="Task"></parameter>'."\n";   $result.=&Apache::response::meta_package_write('Task');
  #$result.=&Apache::response::meta_part_order();          $result.=&Apache::response::meta_stores_write('solved','string',
  #$result.=&Apache::response::meta_response_order();        'Problem Status');
    $result.=&Apache::response::meta_stores_write('tries','int_zeropos',
         'Number of Attempts');
    $result.=&Apache::response::meta_stores_write('awarded','float',
         'Partial Credit Factor');
    $result.=&Apache::response::meta_stores_write('status','string',
         'Bridge Task Status');
       } elsif ($target eq 'edit') {
    &Apache::structuretags::reset_problem_globals('Task');
    undef($Apache::lonhomework::parsing_a_task);
    return ('','no');
     }      }
       &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }
Line 844  sub move_between_queues { Line 1262  sub move_between_queues {
     } else {      } else {
  $cur_data = ['none'];   $cur_data = ['none'];
     }      }
     my $result=&add_to_queue($dest_queue,$cur_data->[0]);      my $result=&add_to_queue($dest_queue,$cur_data);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  return $result;   return $result;
     }      }
Line 855  sub move_between_queues { Line 1273  sub move_between_queues {
 sub check_queue_unlock {  sub check_queue_unlock {
     my ($queue,$key,$allow_not_me)=@_;      my ($queue,$key,$allow_not_me)=@_;
     if ($queue eq 'none') { return 'ok'; }      if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     if (!defined($key)) {      if (!defined($key)) {
  $key="$symb\0queue\0$uname\@$udom";   $key="$symb\0queue\0$uname:$udom";
     }      }
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my $who=&queue_key_locked($queue,$key,$cdom,$cnum);      my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
     if  ($who eq $me) {      if  ($who eq $me) {
    &Apache::lonxml::debug("unlocking my own $who");
  return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);   return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
     } elsif ($allow_not_me) {      } elsif ($allow_not_me) {
  &Apache::lonxml::debug("unlocking $who by $me");   &Apache::lonxml::debug("unlocking $who by $me");
Line 872  sub check_queue_unlock { Line 1291  sub check_queue_unlock {
     return 'not_owner';      return 'not_owner';
 }  }
   
   sub in_queue {
       my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
       if ($queue eq 'none') { return 0; }
       if (!defined($symb) || !defined($cdom) || !defined($cnum)
    || !defined($udom) || !defined($uname)) {
    ($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
   
       my $key=&encode_queue_key($symb,$udom,$uname);
       my %results = &Apache::lonnet::get($queue,[$key],$cdom,$cnum);
   
       if (defined($results{$key})) {
    return 1;
       }
       return 0;
   }
   
 sub remove_from_queue {  sub remove_from_queue {
     my ($queue)=@_;      my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
     if ($queue eq 'none') { return 'ok'; }      if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      if (!defined($symb) || !defined($cdom) || !defined($cnum)
     my $cnum=$env{'course.'.$cid.'.num'};   || !defined($udom) || !defined($uname)) {
     my $cdom=$env{'course.'.$cid.'.domain'};   ($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $key="$symb\0queue\0$uname\@$udom";   $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
       if (!&in_queue($queue,$symb,$cdom,$cnum,$udom,$uname)) {
    return 'ok';
       }
       my $key=&encode_queue_key($symb,$udom,$uname);
     my @keys=($key,"$key\0locked");      my @keys=($key,"$key\0locked");
     return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);      return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
 }  }
Line 895  sub setup_env_for_other_user { Line 1339  sub setup_env_for_other_user {
 }  }
   
 sub get_queue_data {  sub get_queue_data {
     my ($queue)=@_;      my ($queue,$udom,$uname)=@_;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonnet::whichuser();
       if (!$uname || !$udom) {
    $uname=$other_uname;
    $udom =$other_udom;
       }
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $todo="$symb\0queue\0$uname\@$udom";      my $todo="$symb\0queue\0$uname:$udom";
     my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);      my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
     if ($key eq $todo && ref($value)) {      if ($key eq $todo && ref($value)) {
  return $value;   return $value;
Line 907  sub get_queue_data { Line 1355  sub get_queue_data {
     return undef;      return undef;
 }  }
   
   
 sub check_queue_for_key {  sub check_queue_for_key {
     my ($cid,$queue,$todo)=@_;      my ($cdom,$cnum,$queue,$todo)=@_;
     my $cnum=$env{'course.'.$cid.'.num'};  
     my $cdom=$env{'course.'.$cid.'.domain'};  
     my %results=      my %results=
  &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);   &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);
           
Line 918  sub check_queue_for_key { Line 1366  sub check_queue_for_key {
  if (defined($results{"$todo\0locked"})) {   if (defined($results{"$todo\0locked"})) {
     return 'locked';      return 'locked';
  }   }
  my $slot=$results{$todo}->[0];   if (my $slot=&slotted_access($results{$todo})) {
  my %slot_data=&Apache::lonnet::get_slot($slot);      my %slot_data=&Apache::lonnet::get_slot($slot);
  if ($slot_data{'endtime'} > time) {       if ($slot_data{'endtime'} > time) { 
     return 'in_progress';   return 'in_progress';
       }
    } else {
       my ($symb) = &decode_queue_key($todo);
       my $due_date = &Apache::lonhomework::due_date('0',$symb);
       if ($due_date > time) {
    return 'in_progress';
       }
  }   }
  return 'enqueued';   return 'enqueued';
     }      }
Line 929  sub check_queue_for_key { Line 1384  sub check_queue_for_key {
 }  }
   
 sub add_to_queue {  sub add_to_queue {
     my ($queue,$slot_name)=@_;      my ($queue,$user_data)=@_;
     if ($queue eq 'none') { return 'ok'; }      if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
       if (!$cid || $env{'request.state'} eq 'construct') {
    return 'no_queue';
       }
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my %data;      my %data;
     $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];      $data{"$symb\0queue\0$uname:$udom"}=$user_data;
     return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);      return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
   }
   
   sub get_limited_classlist {
       my ($sections) = @_;
   
       my $classlist = &Apache::loncoursedata::get_classlist();
       foreach my $student (keys(%$classlist)) {
    if ( $classlist->{$student}[&Apache::loncoursedata::CL_STATUS()]
        ne 'Active') {
       delete($classlist->{$student});
           }
       }
   
       if (ref($sections) && !grep('all',@{ $sections })) {
    foreach my $student (keys(%$classlist)) {
       my $section  = 
    $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];
       if (! grep($section,@{ $sections })) {
    delete($classlist->{$student});
       }
    }
       }
       return $classlist;
 }  }
   
   
 sub show_queue {  sub show_queue {
     my ($queue,$with_selects)=@_;      my ($queue,$with_selects)=@_;
     my $result;      my $result;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
   
     my @chosen_sections=      my @chosen_sections=
  &Apache::loncommon::get_env_multiple('form.chosensections');   &Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();  
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);      my $classlist = &get_limited_classlist(\@chosen_sections);
     &Apache::grades::reset_perm();  
     if (!(grep(/^all$/,@chosen_sections))) {      if (!(grep(/^all$/,@chosen_sections))) {
  $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).   $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
     '</tt>.</p> '."\n";      '</tt>.</p> '."\n";
     }      }
   
       my ($view,$view_section);
       my $scope = $env{'request.course.id'};
       if (!($view=&Apache::lonnet::allowed('vgr',$scope))) {
    $scope .= '/'.$env{'request.course.sec'};
    if ( $view = &Apache::lonnet::allowed('vgr',$scope)) {
       $view_section=$env{'request.course.sec'};
    } else {
       undef($view);
    }
       }
   
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;      my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";   return "\n<h3>Current Queue - $queue</h3>".
     }      &Apache::loncommon::start_data_table().
     $result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";      &Apache::loncommon::start_data_table_row().
     if ($with_selects) { $result.="<th></th>"; }      '<td>'.&mt('Empty').'</td>'.
     $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";      &Apache::loncommon::end_data_table_row().
       &Apache::loncommon::end_data_table();
       }
       my $title=&Apache::lonnet::gettitle($symb);
       $result.="\n<h3>Current Queue - $title $queue </h3>".
    &Apache::loncommon::start_data_table().
    &Apache::loncommon::start_data_table_header_row();
       if ($with_selects) { $result.="<th>Status</th><th></th>"; }
       $result.="<th>user</th><th>data</th>".
    &Apache::loncommon::end_data_table_header_row();
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   if (!defined($classlist->{$uname.':'.$udom})) { next; }
   
    my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
   
    my $can_view=1;
    if (!$view
       || ($view_section && !$section)
       || ($view_section && $section && ($view_section ne $section))) {
       $can_view=0;
    }
   
  if ($key=~/locked$/ && !$with_selects) {   if ($key=~/locked$/ && !$with_selects) {
     my $title=&Apache::lonnet::gettitle($symb);      $result.= &Apache::loncommon::start_data_table_row().
     $result.="<tr><td>$title</td><td>$uname</td>";   "<td>$uname</td>";
     $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';      $result.='<td>'.$queue{$key}.'</td></tr>';
  } elsif ($key=~/timestamp$/ && !$with_selects) {   } elsif ($key=~/timestamp$/ && !$with_selects) {
     my ($symb,undef) = split("\0",$key);      $result.=&Apache::loncommon::start_data_table_row()."<td></td>";
     my $title=&Apache::lonnet::gettitle($symb);      $result.='<td>'.
     $result.="<tr><td>$title</td><td></td>";  
     $result.='<td>last queue modification time</td><td>'.  
  &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";   &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
  } elsif ($key!~/(timestamp|locked)$/) {   } elsif ($key!~/(timestamp|locked)$/) {
     my $title=&Apache::lonnet::gettitle($symb);      $result.= &Apache::loncommon::start_data_table_row();
     $result.="<tr>";      my ($end_time,$slot_text);
     my $slot=$queue{$key}->[0];      if (my $slot=&slotted_access($queue{$key})) {
     my %slot_data=&Apache::lonnet::get_slot($slot);   my %slot_data=&Apache::lonnet::get_slot($slot);
    $end_time = $slot_data{'endtime'};
    $slot_text = &mt('Slot: [_1]',$slot);
       } else {
    $end_time = &Apache::lonhomework::due_date('0',$symb);
    $slot_text = '';
       }
     if ($with_selects) {      if ($with_selects) {
  my $ekey=&Apache::lonnet::escape($key);   my $ekey=&escape($key);
  my ($action,$description)=('select',&mt('Select'));   my ($action,$description,$status)=('select',&mt('Select'));
  if (exists($queue{"$key\0locked"})) {   if (exists($queue{"$key\0locked"})) {
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
       $status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
     if ($me eq $queue{"$key\0locked"}) {      if ($me eq $queue{"$key\0locked"}) {
  ($action,$description)=('resume',&mt('Resume'));   ($action,$description)=('resume',&mt('Resume'));
     } else {      } else {
Line 999  sub show_queue { Line 1516  sub show_queue {
     $seclist.='<input type="hidden" name="chosensections"       $seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';                                 value="'.$sec.'" />';
  }   }
  if (time > $slot_data{'endtime'}) {   if ($can_view && ($end_time ne '' && time > $end_time)) {
     $result.=(<<FORM);      $result.=(<<FORM);
   <td>$status</td>
 <td>  <td>
 <form method="POST">  <form style="display: inline" method="post">
  <input type="hidden" name="gradingkey" value="$ekey" />   <input type="hidden" name="gradingkey" value="$ekey" />
  <input type="hidden" name="queue" value="$queue" />   <input type="hidden" name="queue" value="$queue" />
  <input type="hidden" name="gradingaction" value="$action" />   <input type="hidden" name="gradingaction" value="$action" />
Line 1013  sub show_queue { Line 1531  sub show_queue {
 </form>  </form>
 </td>  </td>
 FORM  FORM
                   } elsif (!$can_view && ($end_time ne '' && time > $end_time)) {
       $result.='<td>'.&mt("Not gradable").'</td><td>&nbsp;</td>'
                 } else {                  } else {
     $result.='<td>'.&mt("In Progress").'</td>'      $result.='<td>'.&mt("In Progress").'</td><td>&nbsp;</td>'
  }   }
     }      }
     $result.="<td>$title</td><td>$uname</td>";      $result.= "<td>".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()].
     $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.   " <tt>($uname:$udom)</tt> </td>";
  &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).      $result.='<td>'.$slot_text.' End time: '.
  "</td></tr>";   &Apache::lonlocal::locallocaltime($end_time).
    "</td>".&Apache::loncommon::end_data_table_row();
  }   }
     }      }
     $result.="</table><hr />\n";      $result.= &Apache::loncommon::end_data_table()."<hr />\n";
     return $result;      return $result;
 }  }
   
 sub get_queue_counts {  sub get_queue_counts {
     my ($queue)=@_;      my ($queue)=@_;
     my $result;      my $result;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
   
       my $classlist=&get_limited_classlist();
   
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;      my ($tmp)=%queue;
Line 1041  sub get_queue_counts { Line 1564  sub get_queue_counts {
  return (0,0,0);   return (0,0,0);
     }      }
     my ($entries,$ready_to_grade,$locks)=(0,0,0);      my ($entries,$ready_to_grade,$locks)=(0,0,0);
       my %slot_cache;
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
    my ($symb,$uname,$udom) = &decode_queue_key($key);
    if (!defined($classlist->{$uname.':'.$udom})) { next; }
  if ($key=~/locked$/) {   if ($key=~/locked$/) {
     $locks++;      $locks++;
  } elsif ($key=~/timestamp$/) {   } elsif ($key=~/timestamp$/) {
     #ignore      #ignore
  } elsif ($key!~/(timestamp|locked)$/) {   } elsif ($key!~/(timestamp|locked)$/) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);  
     $entries++;      $entries++;
     my $slot=$queue{$key}->[0];      if (my $slot=&slotted_access($queue{$key})) {
     my %slot_data=&Apache::lonnet::get_slot($slot);   if (!exists($slot_cache{$slot})) {
     if (time > $slot_data{'endtime'}) {      my %slot_data=&Apache::lonnet::get_slot($slot);
  $ready_to_grade++;      $slot_cache{$slot} = \%slot_data;
    }
    if (time > $slot_cache{$slot}{'endtime'}) {
       $ready_to_grade++;
    }
       } else {
    my $due_date = &Apache::lonhomework::due_date('0',$symb);
    if ($due_date ne '' && time > $due_date) {
       $ready_to_grade++;
    }
     }      }
  }   }
     }      }
Line 1061  sub get_queue_counts { Line 1595  sub get_queue_counts {
   
 sub encode_queue_key {  sub encode_queue_key {
     my ($symb,$udom,$uname)=@_;      my ($symb,$udom,$uname)=@_;
     return "$symb\0queue\0$uname\@$udom";      return "$symb\0queue\0$uname:$udom";
 }  }
   
 sub decode_queue_key {  sub decode_queue_key {
     my ($key)=@_;      my ($key)=@_;
     my ($symb,undef,$user) = split("\0",$key);      my ($symb,undef,$user) = split("\0",$key);
     my ($uname,$udom) = split('@',$user);      my ($uname,$udom) = split(':',$user);
     return ($symb,$uname,$udom);      return ($symb,$uname,$udom);
 }  }
   
 sub queue_key_locked {  sub queue_key_locked {
     my ($queue,$key,$cdom,$cnum)=@_;      my ($queue,$key,$cdom,$cnum)=@_;
     if (!defined($cdom) || !defined($cnum)) {      if (!defined($cdom) || !defined($cnum)) {
  my (undef,$cid)=&Apache::lonxml::whichuser();   my (undef,$cid)=&Apache::lonnet::whichuser();
  $cnum=$env{'course.'.$cid.'.num'};   $cnum=$env{'course.'.$cid.'.num'};
  $cdom=$env{'course.'.$cid.'.domain'};   $cdom=$env{'course.'.$cid.'.domain'};
     }      }
Line 1086  sub queue_key_locked { Line 1620  sub queue_key_locked {
     return undef;      return undef;
 }  }
   
   sub slotted_access {
       my ($queue_entry) = @_;
       if (ref($queue_entry) eq 'ARRAY') {
    if (defined($queue_entry->[0])) {
       return $queue_entry->[0];
    }
    return undef;
       } elsif (ref($queue_entry) eq 'HASH') {
    if (defined($queue_entry->{'slot'})) {
       return $queue_entry->{'slot'};
    }
    return undef;
       }
       return undef;
   }
   
 sub pick_from_queue_data {  sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;      my ($queue,$check_section,$queuedata,$cdom,$cnum,$classlist)=@_;
       my @possible; # will hold queue entries that are valid to be selected
     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 (!defined($classlist->{$uname.':'.$udom})) { next; }
   
  if ($check_section) {   if ($check_section) {
     my $section=&Apache::lonnet::getsection($uname,$udom);      my $section =
    $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
     if ($section eq $check_section) {      if ($section eq $check_section) {
  &Apache::lonxml::debug("my sec");   &Apache::lonxml::debug("my sec");
  next;   next;
     }      }
  }   }
  my $slot=$queuedata->{$key}[0];   my $end_time;
  my %slot_data=&Apache::lonnet::get_slot($slot);   if (my $slot=&slotted_access($queuedata->{$key})) {
  if ($slot_data{'endtime'} > time) {       &Apache::lonxml::debug("looking at slot $slot");
     &Apache::lonxml::debug("not time");      my %slot_data=&Apache::lonnet::get_slot($slot);
     next;      if ($slot_data{'endtime'} < time) { 
    $end_time = $slot_data{'endtime'};
       } else {
    &Apache::lonxml::debug("not time ".$slot_data{'endtime'});
    next;
       }
    } else {
       my $due_date = &Apache::lonhomework::due_date('0',$symb);
       if ($due_date < time) {
    $end_time = $due_date;
       } else {
    &Apache::lonxml::debug("not time $due_date");
    next;
       }
  }   }
  if (&queue_key_locked($queue,$key,$cdom,$cnum)) {  
    if (exists($queuedata->{"$key\0locked"})) {
     &Apache::lonxml::debug("someone already has um.");      &Apache::lonxml::debug("someone already has um.");
     next;      next;
  }   }
  return $key;   push(@possible,[$key,$end_time]);
       }
       if (@possible) {
           # sort entries in order by slot end time
    @possible = sort { $a->[1] <=> $b->[1] } @possible;
    # pick one of the entries in the top 10% in small queues and one
    # of the first ten entries in large queues
    #my $ten_percent = int($#possible * 0.1);
    #if ($ten_percent < 1 ) { $ten_percent = 1;  }
    #if ($ten_percent > 10) { $ten_percent = 10; }
    #my $max=($#possible < $ten_percent) ? $#possible : $ten_percent;
   
    #return $possible[int(rand($max))][0];
    return $possible[0][0];
     }      }
     return undef;      return undef;
 }  }
   
 sub find_mid_grade {  sub find_mid_grade {
     my ($queue,$symb,$cdom,$cnum)=@_;      my ($queue,$symb,$cdom,$cnum)=@_;
     my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});      my $todo=&unescape($env{'form.gradingkey'});
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     if ($todo) {      if ($todo) {
  my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);   my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
  if ($who eq $me) { return $todo; }   if ($who eq $me) { return $todo; }
Line 1135  sub find_mid_grade { Line 1719  sub find_mid_grade {
   
 sub lock_key {  sub lock_key {
     my ($queue,$todo)=@_;      my ($queue,$todo)=@_;
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my (undef,$cid)=&Apache::lonxml::whichuser();      my (undef,$cid)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},      my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
Line 1148  sub lock_key { Line 1732  sub lock_key {
     return 0;      return 0;
 }  }
   
   sub get_queue_symb_status {
       my ($queue,$symb,$cdom,$cnum) = @_;
       if (!defined($cdom) || !defined($cnum)) {
    my (undef,$cid)=&Apache::lonnet::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
       my $classlist=&get_limited_classlist();
   
       my $regexp="^$symb\0";
       my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
       my ($tmp)=%queue;
       if ($tmp=~/^error: 2 /) { return; }
       my @users;
       foreach my $key (sort(keys(%queue))) {
    next if ($key=~/locked$/);
    next if ($key=~/timestamp$/);
    my ($symb,$uname,$udom) = &decode_queue_key($key);
    next if (!defined($classlist->{$uname.':'.$udom}));
    push(@users,"$uname:$udom");
       }
       return @users;
   }
   
 sub get_from_queue {  sub get_from_queue {
     my ($queue)=@_;      my ($queue)=@_;
     my $result;      my $result;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);      my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
     &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));      &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
     if ($todo) { return $todo; }      if ($todo) { return $todo; }
       my $attempts=0;
   
       my $classlist=&get_limited_classlist();
   
     while (1) {      while (1) {
    if ($attempts > 2) {
       # tried twice to get a queue entry, giving up
       return (undef,'unable');
    }
  my $starttime=time;   my $starttime=time;
  &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},   &Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime},
      $cdom,$cnum);        $cdom,$cnum);
  &Apache::lonxml::debug("$starttime");   &Apache::lonxml::debug("$starttime");
  my $regexp="^$symb\0queue\0";   my $regexp="^$symb\0queue\0";
    #my $range= ($attempts < 1 ) ? '0-100' : '0-400';
   
  my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);   my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
  #make a pass looking for a user _not_ in my section   #make a pass looking for a user _not_ in my section
  if ($env{'request.course.sec'}) {   if ($env{'request.course.sec'}) {
     &Apache::lonxml::debug("sce");      &Apache::lonxml::debug("sce");
     $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},      $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
  \%queue,$cdom,$cnum);   \%queue,$cdom,$cnum,$classlist);
     &Apache::lonxml::debug("sce $todo");      &Apache::lonxml::debug("sce $todo");
  }   }
  # no one _not_ in our section so look for any user that is   # no one _not_ in our section so look for any user that is
  # ready for grading   # ready for grading
  if (!$todo) {   if (!$todo) {
     &Apache::lonxml::debug("no sce");      &Apache::lonxml::debug("no sce");
     $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},      $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum,
  \%queue,$cdom,$cnum);   $classlist);
     &Apache::lonxml::debug("no sce $todo");      &Apache::lonxml::debug("no sce $todo");
  }   }
  # no user to grade    # no user to grade 
Line 1184  sub get_from_queue { Line 1802  sub get_from_queue {
  &Apache::lonxml::debug("got $todo");   &Apache::lonxml::debug("got $todo");
  # otherwise found someone so lets try to lock them   # otherwise found someone so lets try to lock them
  # unless someone else already picked them   # unless someone else already picked them
  if (!&lock_key($queue,$todo)) { next; }   if (!&lock_key($queue,$todo)) {
       $attempts++;
       next;
    }
  my (undef,$endtime)=   my (undef,$endtime)=
     &Apache::lonnet::get($queue,["$symb\0timestamp"],      &Apache::lonnet::get($queue,["$symb\0timestamp"],
  $cdom,$cnum);   $cdom,$cnum);
Line 1203  sub get_from_queue { Line 1824  sub get_from_queue {
  &Apache::lonnet::del($queue,["$todo\0locked"],   &Apache::lonnet::del($queue,["$todo\0locked"],
      $cdom,$cnum);       $cdom,$cnum);
  &Apache::lonxml::debug("del");   &Apache::lonxml::debug("del");
    $attempts++;
  next;   next;
     }      }
  }   }
Line 1213  sub get_from_queue { Line 1835  sub get_from_queue {
 }  }
   
 sub select_user {  sub select_user {
     my ($symb,$cid)=&Apache::lonxml::whichuser();      my ($symb,$cid)=&Apache::lonnet::whichuser();
   
     my @chosen_sections=      my @chosen_sections=
  &Apache::loncommon::get_env_multiple('form.chosensections');   &Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();  
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);      my $classlist = &get_limited_classlist(\@chosen_sections);
     &Apache::grades::reset_perm();  
           
     my $result;      my $result;
     if (!(grep(/^all$/,@chosen_sections))) {      if (!(grep(/^all$/,@chosen_sections))) {
  $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).   $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
     '</tt>.</p> '."\n";      '</tt>.</p> '."\n";
     }      }
     $result.='<table border="1">';      $result.=&Apache::loncommon::start_data_table();
   
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {      foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) {
  my ($uname,$udom) = split(/:/,$student);   my ($uname,$udom) = split(/:/,$student);
   
  my %status = &get_student_status($symb,$cid,$udom,$uname);   my $cnum=$env{'course.'.$cid.'.num'};
    my $cdom=$env{'course.'.$cid.'.domain'};
    my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname,
    'Task');
  my $queue = 'none';   my $queue = 'none';
  my $cannot_grade;   my $cannot_grade;
  if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {   if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
Line 1246  sub select_user { Line 1870  sub select_user {
     }      }
  }   }
  my $todo =    my $todo = 
     &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));      &escape(&encode_queue_key($symb,$udom,$uname));
  if ($cannot_grade) {   if ($cannot_grade) {
     $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.      $result.=&Apache::loncommon::start_data_table_row().
    '<td>&nbsp;</td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
  '</td><td>';   '</td><td>';
  } else {   } else {
     my $seclist;      my $seclist;
Line 1256  sub select_user { Line 1881  sub select_user {
  $seclist.='<input type="hidden" name="chosensections"    $seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';                                 value="'.$sec.'" />';
     }      }
       $result.=&Apache::loncommon::start_data_table_row();
     $result.=<<RESULT;      $result.=<<RESULT;
 <tr>  
   <td>    <td>
     <form method="POST">      <form style="display: inline" method="post">
       <input type="hidden" name="gradingkey" value="$todo" />        <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />        <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />        <input type="hidden" name="webgrade" value="no" />
Line 1267  sub select_user { Line 1892  sub select_user {
       <input type="submit" name="submit" value="Regrade" />        <input type="submit" name="submit" value="Regrade" />
       $seclist        $seclist
     </form>      </form>
   <td>$fullname->{$student}</td>    <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td>
   <td>    <td>
 RESULT  RESULT
         }          }
Line 1287  RESULT Line 1912  RESULT
  if ($status{'version'}) {   if ($status{'version'}) {
     $result .= ' '.&mt('Version').' '.$status{'version'};      $result .= ' '.&mt('Version').' '.$status{'version'};
  }   }
    if ($status{'grader'}) {
       $result .= ' '.&mt('(Graded by [_1])',$status{'grader'}).' ';
    }
  $result.= '</td><td>';   $result.= '</td><td>';
  if ($status{'reviewqueue'} eq 'enqueued') {   if ($status{'reviewqueue'} eq 'enqueued') {
     $result .= &mt('Awaiting Review');      $result .= &mt('Awaiting Review');
Line 1303  RESULT Line 1931  RESULT
  } else {   } else {
     $result.="&nbsp;";      $result.="&nbsp;";
  }   }
  $result.= '</td></tr>';   $result.= '</td>'.&Apache::loncommon::end_data_table_row();
     }      }
     $result.='</table>';      $result.=&Apache::loncommon::end_data_table();
     return $result;      return $result;
 }  }
   
 sub get_student_status {  sub get_student_status {
     my ($symb,$cid,$udom,$uname)=@_;      my ($symb,$cdom,$cnum,$udom,$uname,$type)=@_;
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},  
   $udom,$uname);  
     my %status;      my %status;
     $status{'status'}=$record{'resource.status'};  
     $status{'version'}=$record{'resource.version'};      if ($type eq 'Task') {
     $status{'grader'}=$record{'resource.grader'};   my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
     $status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue',    $udom,$uname);
        &encode_queue_key($symb,$udom,$uname));   $status{'status'}=$record{'resource.0.status'};
     $status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue',   $status{'version'}=$record{'resource.0.version'};
        &encode_queue_key($symb,$udom,$uname));   $status{'grader'}=$record{'resource.0.regrader'};
       }
       $status{'reviewqueue'}=
    &check_queue_for_key($cdom,$cnum,'reviewqueue',
        &encode_queue_key($symb,$udom,$uname));
       $status{'gradingqueue'}=
    &check_queue_for_key($cdom,$cnum,'gradingqueue',
        &encode_queue_key($symb,$udom,$uname));
     return %status;      return %status;
 }  }
   
Line 1344  sub end_ClosingParagraph { Line 1978  sub end_ClosingParagraph {
     return $result;      return $result;
 }  }
   
   sub get_dim_id {
       return $Apache::bridgetask::dimension[-1];
   }
   
 sub get_id {  sub get_id {
     my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
     my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
Line 1351  sub get_id { Line 1989  sub get_id {
     return $id;      return $id;
 }  }
   
 my %dimension;  sub start_Setup {
 sub start_Dimension {  
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     undef(%dimension);      #undef(%dimension);
     my $dim_id=&get_id($parstack,$safeeval);      my $dim = &get_id($parstack,$safeeval);
     $Apache::bridgetask::dimension=$dim_id;      push(@Apache::bridgetask::dimension,$dim);
     push(@Apache::bridgetask::dimensionlist,$dim_id);      &Apache::lonxml::startredirection();
     undef(@Apache::bridgetask::instance);      return &internal_location($dim);
     $Apache::bridgetask::dimensionmandatory{$dim_id}=  }
  &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);  
   {
       my @allowed;
       sub enable_dimension_parsing {
    my ($id) = @_;
    push(@allowed,$id);
       }
       sub disable_dimension_parsing {
    pop(@allowed);
       }
       sub skip_dimension_parsing {
    my ($check) = @_;
    if (!@allowed) { return 0;}
    # if unspecified allow any id
    if ($allowed[-1] eq undef) { return 0;}
   
    return ($check ne $allowed[-1]);
       }
   }
   
   sub start_Question { return &start_Dimension(@_); }
   sub start_Dimension {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $dim = &get_id($parstack,$safeeval);
       my $previous_dim;
       if (@Apache::bridgetask::dimension) {
    $previous_dim = $Apache::bridgetask::dimension[-1];
    push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},
        $dim);
    if(&skip_dimension_parsing($dim)) {
       $dimension{$previous_dim}{'criteria.'.$dim} =
    $token->[4]
    .&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,
         $style)
    .'</'.$tagstack->[-1].'>';
    }
    $dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';
    $dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=
       &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
    push(@{$dimension{$previous_dim}{'criterias'}},$dim);
    $dimension{$dim}{'nested'}=$previous_dim;
    &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
       } else {
    $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}=
       &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
       }
       push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
     return &internal_location($dim_id);      &enable_dimension_parsing($dim);
       return &internal_location($dim);
   }
   
   sub start_QuestionText {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $dim = &get_dim_id();
       my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
       if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
    $dimension{$dim}{'questiontext'}=$text;
       }
       return '';
   }
   
   sub end_QuestionText {
       return '';
 }  }
   
 sub get_instance {  sub get_instance {
     &Apache::response::pushrandomnumber();      my ($dim)=@_;
     my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});      my $rand_alg=&Apache::lonnet::get_rand_alg();
     my $num=@order;      if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
     my $version=&get_version();   $rand_alg eq '64bit2' || $rand_alg eq '64bit3' ||
     my $which=($version-1)%$num;   $rand_alg eq '64bit4' ) {
     return $order[$which];   &Apache::response::pushrandomnumber();
    my @order=&Math::Random::random_permutation(@{$dimension{$dim}{'instances'}});
    my $num=@order;
    my $version=&get_version();
    my $which=($version-1)%$num;
    return $order[$which];
       } else {
    my ($version,$previous) = &get_version();
    my $instance = 
       $Apache::lonhomework::history{"resource.$version.0.$dim.instance"};
    if (defined($instance)) { return $instance; }
   
    &Apache::response::pushrandomnumber();
    if (ref($dimension{$dim}{'instances'}) eq 'ARRAY') {
       my @instances = @{$dimension{$dim}{'instances'}};
       # remove disabled instances
       for (my $i=0; $i < $#instances; $i++) {
    if ($dimension{$dim}{$instances[$i].'.disabled'}) {
       splice(@instances,$i,1);
       $i--;
    }
       }
       @instances = &Math::Random::random_permutation(@instances);
       $instance  = $instances[($version-1)%scalar(@instances)];
       if ($version =~ /^\d$/) {
    $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
       $instance;
    $Apache::lonhomework::results{'INTERNAL_store'} = 1; 
       }
    }
    &Apache::response::poprandomnumber();
    return $instance;
       }
   }
   
   sub get_criteria {
       my ($what,$version,$dim,$id) = @_;
       my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
       my $prefix = ($type eq 'criteria') ? "$dim.$id"
                                  : "$id";
       my $entry = "resource.$version.0.$prefix.$what";
       if (exists($Apache::lonhomework::results{$entry})) {
    return $Apache::lonhomework::results{$entry};
       }
       return $Apache::lonhomework::history{$entry};
 }  }
   
 {  {
     my $last_link;      my $last_link;
       sub link {
    my ($id) = @_;
    $id =~ s/\./_/g;
    return 'LC_GRADING_criteria_'.$id;
       }
       sub end_Question { return &end_Dimension(@_); }
     sub end_Dimension {      sub end_Dimension {
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
  my $result=&Apache::lonxml::endredirection();   my $result=&Apache::lonxml::endredirection();
  my $dim=&get_id($parstack,$safeeval);   my $dim=&get_id($parstack,$safeeval);
  my $instance=&get_instance();   if (&skip_dimension_parsing($dim)) {
       &disable_dimension_parsing($dim);
       pop(@Apache::bridgetask::dimension);
       return;
    }
    my $instance=&get_instance($dim);
  my $version=&get_version();   my $version=&get_version();
  if ($target eq 'web') {   if ($target eq 'web') {
     @Apache::scripttag::parser_env = @_;      $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
     $result.=&Apache::scripttag::xmlparse($dimension{'intro'});      my @instances = $instance;
     @Apache::scripttag::parser_env = @_;      if (&Apache::response::showallfoils()) {
     $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});   @instances = @{$dimension{$dim}{'instances'}};
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||      }
  $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {      my $shown_question_text;
       foreach my $instance (@instances) {
  my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};   $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
  my $mandatory='Mandatory';   [@_]);
  if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {   $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
     $mandatory='Optional';   [@_],{'set_dim_id' => undef});
  }   my $task_status = 
  my $dim_info="<div class='$dim_status'>\n";      $Apache::lonhomework::history{"resource.$version.0.status"};
  if ($dim_status eq 'pass') {   if ($task_status ne 'pass' && $task_status ne 'fail') {
     $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';  
  }      foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
  if ($dim_status eq 'fail') {      @{$dimension{$dim}{'criterias'}}) {
     $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';   my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
  }   &Apache::lonxml::debug("$id is $type");
  my $man_count=0;   if ($type eq 'dimension') {
  my $man_passed=0;      $result.=
  my $opt_count=0;   &nested_parse(\$dimension{$dim}{'criteria.'.$id},
  my $opt_passed=0;        [@_],{'set_dim_id' => $id});
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {  
     if ($dimension{$instance.'.criteria.'.$id.'.mandatory'}   
  eq 'N') {  
  $opt_count++;  
  if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {  
     $opt_passed++;  
  }  
     } else {  
  $man_count++;  
  if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {  
     $man_passed++;  
  }   }
     }      }
  }   } else {
  if ($man_passed eq $man_count) { $man_passed='all'; }      my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
  my $opt_req=$dimension{$instance.'.optionalrequired'};      my $mandatory='Mandatory';
  if ($opt_req !~ /\S/) { $opt_req='0'; }      if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
  $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>";  
   
  my $internal_location=&internal_location($dim);  
  $result=~s/\Q$internal_location\E/$dim_info/;  
   
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {  
     my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};  
     my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};  
     my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');  
     if ($mandatory) {  
  $mandatory='Mandatory';  
     } else {  
  $mandatory='Optional';   $mandatory='Optional';
     }      }
     if ($status eq 'fail') {      my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
     } elsif ($status eq 'pass') {      if ($dim_status eq 'pass') {
     } else {   $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
  &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");      }
       if ($dim_status eq 'fail') {
    $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
       }
       my $man_count=0;
       my $man_passed=0;
       my $opt_count=0;
       my $opt_passed=0;
       foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}},
        @{$dimension{$dim}{'criterias'}} ) {
    my $status = &get_criteria('status',$version,$dim,$id);
    if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} 
       eq 'N') {
       $opt_count++;
       if ($status eq 'pass') { $opt_passed++; }
    } else {
       $man_count++;
       if ($status eq 'pass') { $man_passed++; }
    }
       }
       if ($man_passed eq $man_count) { $man_passed='all'; }
   
       my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'};
       if ($opt_req !~ /\S/) {
    $opt_req=
       &Apache::lonxml::get_param('OptionalRequired',
          $parstack,$safeeval);
    if ($opt_req !~ /\S/) { $opt_req = 0; }
     }      }
     my $status_display=$status;      $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>";
     $status_display=~s/^([a-z])/uc($1)/e;  
     @Apache::scripttag::parser_env = @_;      my $internal_location=&internal_location($dim);
     $result.='<div class="'.$status.'"><h4>'.$mandatory.      $result=~s/\Q$internal_location\E/$dim_info/;
  ' Criteria</h4><p>';  
     @Apache::scripttag::parser_env = @_;      foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
     $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});      @{$dimension{$dim}{'criterias'}}) {
     $result.='</p><p class="grade">'.$status_display.'</p>';   my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
     if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {   if ($type eq 'dimension') {
  $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';      $result.=$dimension{$id}{'result'};
       next;
    }
     }      }
     $result.='</div>';  
  }   }
     }      }
  } elsif ($target eq 'webgrade') {   } elsif ($target eq 'webgrade') {
     # in case of any side effects that we need      # in case of any side effects that we need
     @Apache::scripttag::parser_env = @_;      &nested_parse(\$dimension{$dim}{'intro'},[@_]);
     &Apache::scripttag::xmlparse($dimension{'intro'});      &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
     @Apache::scripttag::parser_env = @_;      $result.=
     &Apache::scripttag::xmlparse($dimension{$instance.'.text'});   &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {        {'set_dim_id'          => undef,
  my $link='criteria_'.$instance.'_'.$id;         'delayed_dim_results' => 1});
  my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};      foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
  $result.='<tr><td width="100%" valign="top">'.      @{$dimension{$dim}{'criterias'}} ) {
     '<a name="'.$link.'" />'.   my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
     '<a name="next_'.$last_link.'" />'.   if ($type eq 'dimension') {
     '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';      # dimensional 'criteria' don't get assigned grades
  @Apache::scripttag::parser_env = @_;      $result.=
  $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});   &nested_parse(\$dimension{$dim}{'criteria.'.$id},
  $result.='</textarea>'.        [@_],{'set_dim_id' => $id});
     #$dimension{$instance.'.criteria.'.$id}.      next;
     '</td>'.   }
     '<td><nobr>Additional Comment for Student</nobr> <br />'.  
     '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.   my $link=&link($id);
     '</td>'.   my $status= &get_criteria('status',$version,$dim,$id);
     '<td>'.   $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
     '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.      '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
     '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.   $result.=
     '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.      &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]);
     '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.  
     '</td>'.   $result.='</div>'."\n".
     '<td>'.      '<div class="LC_GRADING_grade">'."\n".
     '<a href="#'.$last_link.'">Prev</a><br />'.      '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
     '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.      '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
     '<input type="submit" name="next" value="'.      '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
     &mt('Done').'" /> '.      '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
     '<input type="submit" name="stop" value="'.      '</div>'."\n".
     &mt('Stop').'" /> '.      '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
     '</td></tr>';      '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode(&get_criteria('comment',$version,$dim,$id),'<>"&').'</textarea>'."\n".
  $result.='<tr><td colspan="4">';      '</label>'."\n".
  my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();      '<ul class="LC_GRADING_navbuttons">'."\n".
  my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';      '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
  foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {      '<li><a href="#next_'.$link.'">Next</a></li>'."\n".
     my $file=$file_url.$partial_file;      '</ul>'."\n".
     $file=~s|/+|/|g;                      '</div>'."\n";
     &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);   $result.=&grading_history($version,$dim,$id);
     $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.  
  &Apache::loncommon::icon($file).'" border=0"> '.$file.  
  '</a></nobr> ';  
  }  
  $result.='</td></tr>';  
  $last_link=$link;   $last_link=$link;
     }      }
       if (&nest()) {
    &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});
    $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;
    undef($result);
       }
  } elsif ($target eq 'grade' && $env{'form.webgrade'}) {   } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
     my $optional_passed=0;      my $optional_passed=0;
     my $mandatory_failed=0;      my $mandatory_failed=0;
     my $ungraded=0;      my $ungraded=0;
     my $review=0;      my $review=0;
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {  
  my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};      $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
  $Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};      $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
  my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');       [@_]);
       $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
        [@_],{'set_dim_id' => undef});
   
       foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
       @{$dimension{$dim}{'criterias'}}) {
    my $link=&link($id);
   
    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
    if ($type eq 'criteria') {
       # dimensional 'criteria' don't get assigned grades
       $Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
       $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
    } else {
       $result .=
    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
         [@_],{'set_dim_id' => $id});
    }
    my $status= &get_criteria('status',$version,$dim,$id);
   
    my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
  if ($status eq 'pass') {   if ($status eq 'pass') {
     if (!$mandatory) { $optional_passed++; }      if (!$mandatory) { $optional_passed++; }
  } elsif ($status eq 'fail') {   } elsif ($status eq 'fail') {
Line 1526  sub get_instance { Line 2304  sub get_instance {
     $ungraded++;      $ungraded++;
  }   }
     }      }
     if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {      # FIXME optional required can apply to only <instance> right now...
       my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'};
       if ($opt_req !~ /\S/) {
    $opt_req=
       &Apache::lonxml::get_param('OptionalRequired',
          $parstack,$safeeval);
    if ($opt_req !~ /\S/) { $opt_req = 0; }
       }
       if ($optional_passed < $opt_req) {
  $mandatory_failed++;   $mandatory_failed++;
     }      }
     &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");      &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'review';      'review';
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'ungraded';      'ungraded';
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'fail';      'fail';
     } else {      } else {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'pass';      'pass';
     }      }
    } else {
       # any other targets no output
       undef($result);
  }   }
    &disable_dimension_parsing();
    pop(@Apache::bridgetask::dimension);
    return $result;
       }
   
       sub end_Setup {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
    my $result=&Apache::lonxml::endredirection();
    my $dim=&get_id($parstack,$safeeval);
    my $instance=&get_instance($dim);
    my $version=&get_version();
    if ($target eq 'web') {
       @Apache::scripttag::parser_env = @_;
       $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
       my @instances = $instance;
       if (&Apache::response::showallfoils()) {
    @instances = @{$dimension{$dim}{'instances'}};
       }
       foreach my $instance (@instances) {
    @Apache::scripttag::parser_env = @_;
    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
    @Apache::scripttag::parser_env = @_;
    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
       }
    } elsif ($target eq 'webgrade' 
    || $target eq 'grade' && $env{'form.webgrade'}) {
       # in case of any side effects that we need
       @Apache::scripttag::parser_env = @_;
       &Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
       @Apache::scripttag::parser_env = @_;
       &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
       @Apache::scripttag::parser_env = @_;
       &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
    } else {
       # any other targets no output
       undef($result);
    }
    pop(@Apache::bridgetask::dimension);
  return $result;   return $result;
     }      }
 }  }
   
   sub grading_history {
       my ($version,$dim,$id) = @_;
       if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
    return '';
       }
       my ($result,$grader);
       my $scope="resource.$version.0.$dim.$id";
       foreach my $t (1..$Apache::lonhomework::history{'version'}) {
    if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
       my ($gname,$gdom) = 
    split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'});
       my $fullname = &Apache::loncommon::plainname($gname,$gdom);
       $grader = &Apache::loncommon::aboutmewrapper($fullname,
    $gname,$gdom);
    }
    my $entry;
    if (exists($Apache::lonhomework::history{"$t:$scope.status"})) {
       $entry.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>';
    }
    if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) {
       $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
    }
    if ($entry) {
       $result.= "<li>$grader : $entry </li>";
    }
       }
       if ($result) {
    return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
       }
       return '';
   }
   
 sub start_IntroParagraph {  sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'webgrade') {      my $dim = &get_dim_id();
  if ($tagstack->[-2] eq 'Dimension') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
     $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);   if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {
       $dimension{$dim}{'intro'}=
  } elsif ($target eq 'webgrade') {   &Apache::lonxml::get_all_text('/introparagraph',
     &Apache::lonxml::get_all_text('/introparagraph',$parser);        $parser,$style);
           } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
       &Apache::lonxml::startredirection();
  }   }
   
     }      }
Line 1564  sub start_IntroParagraph { Line 2425  sub start_IntroParagraph {
 }  }
   
 sub end_IntroParagraph {  sub end_IntroParagraph {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
    my $result = &Apache::lonxml::endredirection();
       }
 }  }
   
 sub start_Instance {  sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id=&get_id($parstack,$safeeval);      my $dim = &get_dim_id();
     push(@{$dimension{'instances'}},$id);      my $id  = &get_id($parstack,$safeeval);
     push(@Apache::bridgetask::instance,$id);      push(@{$dimension{$dim}{'instances'}},$id);
       push(@{$Apache::bridgetask::instance{$dim}},$id);
     push(@Apache::bridgetask::instancelist,$id);      push(@Apache::bridgetask::instancelist,$id);
     $dimension{$id.'.optionalrequired'}=      $dimension{$dim}{$id.'.optionalrequired'}=
  &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);   &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
       my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval);
       if (lc($disabled) eq 'yes') {
    $dimension{$dim}{$id.'.disabled'}='1';
       }
     return '';      return '';
 }  }
   
Line 1581  sub end_Instance { Line 2451  sub end_Instance {
 }  }
   
 sub start_InstanceText {  sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];      my $dim = &get_dim_id();
     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);      my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
     if ($target eq 'web' || $target eq 'webgrade') {      my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
  $dimension{$instance_id.'.text'}=$text;      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
    $dimension{$dim}{$instance_id.'.text'}=$text;
     }      }
     return '';      return '';
 }  }
Line 1595  sub end_InstanceText { Line 2466  sub end_InstanceText {
 }  }
   
 sub start_Criteria {  sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];      my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
     my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);      my $result = '';
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
    my $dim = &get_dim_id();
  my $id=&get_id($parstack,$safeeval);   my $id=&get_id($parstack,$safeeval);
  $dimension{$instance_id.'.criteria.'.$id}=$criteria;   &Apache::lonxml::debug("Criteria $id with $dim");
  $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=   if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
     &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);      my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
  push(@{$dimension{$instance_id.'.criterias'}},$id);      $dimension{$dim}{"criteria.$instance_id.$id"}=$criteria;
       $dimension{$dim}{"criteria.$instance_id.$id.type"}='criteria';
       $dimension{$dim}{"criteria.$instance_id.$id.mandatory"}=
    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
       push(@{$dimension{$dim}{$instance_id.'.criterias'}},"$instance_id.$id");
    } else {
       $dimension{$dim}{'criteria.'.$id}=$criteria;
       $dimension{$dim}{'criteria.'.$id.'.type'}='criteria';
       $dimension{$dim}{'criteria.'.$id.'.mandatory'}=
    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
       push(@{$dimension{$dim}{'criterias'}},$id);
   
       my $version=&get_version();
       my $task_status = 
    $Apache::lonhomework::history{"resource.$version.0.status"};
       if ($target eq 'web' 
    && ($task_status eq 'pass' || $task_status eq 'fail')) {
    my $status= &get_criteria('status', $version,$dim,$id);
    my $comment=&get_criteria('comment',$version,$dim,$id);
    my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
    if ($mandatory) {
       $mandatory='Mandatory';
    } else {
       $mandatory='Optional';
    }
    my $status_display=$status;
    $status_display=~s/^([a-z])/uc($1)/e;
    $result.=
       '<div class="LC_'.$status.' LC_criteria"><h4>'
       .$mandatory.' Criteria</h4><p>';
    $result.=
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]);
    $result.='</p><p class="LC_grade">'.$status_display.'</p>';
    if ($comment =~ /\w/) {
       $result.='<p class="LC_comment">'.
    &mt('Comment: [_1]',$comment).'</p>';
    }
    $result.='</div>';
       }
    }
     }      }
     return '';      return $result;
 }  }
   
 sub end_Criteria {  sub end_Criteria {
 }  }
   
   sub start_GraderNote {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       
       if ($target eq 'webgrade') {
    return '<div class="LC_GRADING_gradernote"><b>'.
       &mt('Note to graders:').'</b>';
       }
       my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); 
       return;
   }
   
   sub end_GraderNote {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
       if ($target eq 'webgrade') {
    return '</div>';
       }
       return;
   }
   
   
   
 sub proctor_validation_screen {  sub proctor_validation_screen {
     my ($slot) = @_;      my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');      my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
     my $name=&Apache::loncommon::plainname($user,$domain);      my $name=&Apache::loncommon::plainname($user,$domain);
           
Line 1627  sub proctor_validation_screen { Line 2560  sub proctor_validation_screen {
 <h2>Proctor Validation</h2>  <h2>Proctor Validation</h2>
     <p>Your room's proctor needs to validate your access to this resource.</p>      <p>Your room's proctor needs to validate your access to this resource.</p>
     $msg      $msg
 <form name="checkout" method="POST" action="$env{'request.uri'}">  <form name="checkout" method="post" action="$env{'request.uri'}">
 <input type="hidden" name="validate" value="yes" />  <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />  <input type="hidden" name="submitted" value="yes" />
 <table>  <table>
Line 1642  sub proctor_validation_screen { Line 2575  sub proctor_validation_screen {
       <tr><td colspan="2">Student who should be logged in is:</td></tr>        <tr><td colspan="2">Student who should be logged in is:</td></tr>
       <tr><td>Name:</td><td>$name</td></tr>        <tr><td>Name:</td><td>$name</td></tr>
       <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>        <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
       <tr><td>Usename</td><td>$user\@$domain</td></tr>        <tr><td>Usename</td><td>$user:$domain</td></tr>
       <tr><td colspan="2"><img src="$url" /></td></tr>        <tr><td colspan="2"><img src="$url" /></td></tr>
     </table>      </table>
   </tr></td>    </tr></td>
Removed from v.1.67  
changed lines
  Added in v.1.191

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