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

Diff for /loncom/homework/bridgetask.pm between versions 1.178 and 1.236

version 1.178, 2006/06/23 22:32:39 version 1.236, 2007/08/03 23:29:57
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;  use LONCAPA;
     
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph'));      &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','CriteriaText','GraderNote','ClosingParagraph'));
 }  }
   
 my %dimension;  my %dimension;
   my $top = 'top';
   
 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  
     %Apache::bridgetask::top_dimensionlist=();  
     # 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
Line 98  sub check_in { Line 97  sub check_in {
  &check_in_sequence($user,$domain,$slot_name);   &check_in_sequence($user,$domain,$slot_name);
     } else {      } else {
  &create_new_version($type,$user,$domain,$slot_name);   &create_new_version($type,$user,$domain,$slot_name);
    &Apache::structuretags::finalize_storage();
     }      }
     return 1;      return 1;
 }  }
Line 105  sub check_in { Line 105  sub check_in {
 sub check_in_sequence {  sub check_in_sequence {
     my ($user,$domain,$slot_name) = @_;      my ($user,$domain,$slot_name) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     my ($symb) = &Apache::lonxml::whichuser();      my ($symb) = &Apache::lonnet::whichuser();
     my ($map)  = &Apache::lonnet::decode_symb($symb);      my ($map)  = &Apache::lonnet::decode_symb($symb);
     my @resources =       my @resources = 
  $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);   $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);
Line 152  sub create_new_version { Line 152  sub create_new_version {
     } elsif ($type eq 'problem') {      } elsif ($type eq 'problem') {
  &Apache::lonxml::debug("authed $slot_name");   &Apache::lonxml::debug("authed $slot_name");
     }      }
       if (!defined($user) || !defined($domain)) {
     if (defined($user) && defined($domain)) {   $user = $env{'user.name'};
  $Apache::lonhomework::results{"resource.$id.checkedin"}=   $domain = $env{'user.domain'};
     $user.':'.$domain;  
     }      }
   
       $Apache::lonhomework::results{"resource.$id.checkedin"}=
    $user.':'.$domain;
   
     if (defined($slot_name)) {      if (defined($slot_name)) {
  $Apache::lonhomework::results{"resource.$id.checkedin.slot"}=   $Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
     $slot_name;      $slot_name;
Line 222  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 = &Apache::loncommon::get_sections($cdom,$cnum);      my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
Line 231  sub add_grading_button { Line 234  sub add_grading_button {
     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="multiple" name="chosensections" size="'.$size.'">'."\n";      my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
     $sec_select .= "<option value='all' selected='selected'>all</option>\n";      $sec_select .= "\t<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 value=\"$sec\">$sec</option>\n";   $sec_select .= "\t<option value=\"$sec\">$sec</option>\n";
     }      }
     $sec_select .= "<option value='none'>none</option></select>\n";      $sec_select .= "\t<option value='none'>none</option>\n</select>\n";
           
     my $result=' <input type="submit" name="gradeasubmission" value="'.      my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.
  &mt("Get a submission to grade").'" />';   &mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';      $result.="\n\t".'<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'})
    || &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})
    ) {
  my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');   my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
  $result.='<table><tr>';   $result.="\n\t".'<table>'."\n\t\t".'<tr>';
  $result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';   $result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.
  $result.='<td>'.' <input type="submit" name="reviewagrading" value="'.      "\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';
    $result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.
     &mt("Select an entry from the grading queue:").'" /> ';      &mt("Select an entry from the grading queue:").'" /> ';
   
  $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";   $result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
   
  ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');   ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
  $result.='<tr><td>'.   $result.="\n\t\t".'<tr>'.
     ' <input type="submit" name="reviewasubmission" value="'.      "\n\t\t\t".'<td>'.
       "\n\t\t\t\t".'<input type="submit" name="reviewasubmission" value="'.
     &mt("Select an entry from the review queue:").'" /> ';      &mt("Select an entry from the review queue:").'" /> ';
  $result.=&mt("[_1] entries, [_2] ready, [_3] being graded",   $result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
      $entries,$ready,$locks).'</td></tr>'."\n";       $entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
  $result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.   $result.="\n\t\t".'<tr>'.
     &mt("List of user's grade status").'" /> </td></tr></table>'."\n";      "\n\t\t\t".'<td>'.
  $result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.      "\n\t\t\t\t".'<input type="submit" name="regradeasubmission" value="'.
     &mt("Regrade specific user:").'" />'."\n";      &mt("List of user's grade status").'" /> </td>'
  $result.='<input type="text" size="12" name="gradinguser" />';      ."\n\t\t".'</tr>'
       ."\n\t".'</table>'."\n";
    $result.="\n\t".'<p>'.
       "\n\t\t".'<input type="submit" name="regradeaspecificsubmission" value="'.
       &mt("Regrade specific user:").'" />';
    $result.= "\n\t\t".'<input type="text" size="12" name="gradinguser" />';
  $result.=&Apache::loncommon::select_dom_form($env{'user.domain'},   $result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
      'gradingdomain');       'gradingdomain');
  $result.=' '.   $result.=' '.
Line 268  sub add_grading_button { Line 280  sub add_grading_button {
    'gradinguser',     'gradinguser',
    'gradingdomain');     'gradingdomain');
  $result.=&Apache::loncommon::studentbrowser_javascript();   $result.=&Apache::loncommon::studentbrowser_javascript();
  $result.= '</p>';   $result.= '</p>'."\n";
     }      }
     return $result;      return $result;
 }  }
Line 292  sub add_request_another_attempt_button { Line 304  sub add_request_another_attempt_button {
  my $description=&Apache::slotrequest::get_description($slot_name,   my $description=&Apache::slotrequest::get_description($slot_name,
       $slot);        $slot);
  $result.=(<<STUFF);   $result.=(<<STUFF);
 <p> Will be next available: $description </p>      <p> Will be next available: $description </p>
 STUFF  STUFF
     }      }
           
     if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }      if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
     $symb=&escape($symb);      $symb=&escape($symb);
     $result.='<form method="post" action="/adm/slotrequest">'.      $result.=
  '<input type="hidden" name="symb" value="'.$symb.'" />'.          "\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t".
  '<input type="hidden" name="command" value="'.$action.'" />'.   '<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".
    '<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".
  '<input type="submit" name="requestattempt" value="'.   '<input type="submit" name="requestattempt" value="'.
  &mt($text).'" />'.   &mt($text).'" />'."\n\t".
  '</form>';   '</form>'."\n";
     return $result;      return $result;
 }  }
   
Line 323  sub style { Line 336  sub style {
     my ($target) = @_;      my ($target) = @_;
     if ($target eq 'web'      if ($target eq 'web'
  || $target eq 'webgrade') {   || $target eq 'webgrade') {
  return (<<STYLE);   my $style = (<<STYLE);
 <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />  <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
 STYLE  STYLE
           if ($env{'browser.type'} eq 'explorer'
       && $env{'browser.os'} eq 'win' ) {
       if ($env{'browser.version'} < 7) {
    $style .= (<<STYLE);
   <link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie.css" />
   STYLE
               } else {
    $style .= (<<STYLE);
   <link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie7.css" />
   STYLE
       }
    }
    return $style;
     }      }
     return;      return;
 }  }
Line 356  sub nest { Line 382  sub nest {
     }      }
 }  }
   
   sub start_delay {
       push(@delay,1);
   }
   sub end_delay {
       pop(@delay);
   }
   
 sub nested_parse {  sub nested_parse {
     my ($str,$env,$args) = @_;      my ($str,$env,$args) = @_;
     my @old_env = @Apache::scripttag::parser_env;      my @old_env = @Apache::scripttag::parser_env;
Line 372  sub nested_parse { Line 405  sub nested_parse {
     @Apache::scripttag::parser_env = @old_env;      @Apache::scripttag::parser_env = @old_env;
     if ($args->{'delayed_dim_results'}) {      if ($args->{'delayed_dim_results'}) {
  my $dim = &get_dim_id();   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 $dimension{$dim}{'result'};
     }      }
     return $result;      return $result;
Line 383  sub internal_location { Line 418  sub internal_location {
 }  }
   
 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.0.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;
Line 399  sub submission_time_stamp { Line 436  sub submission_time_stamp {
  my ($color,$when)=('#FF6666','after');   my ($color,$when)=('#FF6666','after');
  if ($diff > 0) { ($color,$when)=('#336600','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;
Line 417  sub submission_time_stamp { Line 456  sub submission_time_stamp {
 sub file_list {  sub file_list {
     my ($files,$uname,$udom) = @_;      my ($files,$uname,$udom) = @_;
     if (!defined($uname) || !defined($udom)) {      if (!defined($uname) || !defined($udom)) {
  (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();   (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser();
     }      }
     my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';      my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
   
Line 450  sub webgrade_standard_info { Line 489  sub webgrade_standard_info {
     'stop'   => 'Quit Grading',      'stop'   => 'Quit Grading',
     'fail'   => 'Fail Rest',      'fail'   => 'Fail Rest',
     'cancel' => 'Cancel',      'cancel' => 'Cancel',
       'submit' => 'Submit Grades',
     );      );
     %lt=&Apache::lonlocal::texthash(%lt);      %lt=&Apache::lonlocal::texthash(%lt);
   
Line 457  sub webgrade_standard_info { Line 497  sub webgrade_standard_info {
   <div class="LC_GRADING_maincontrols">    <div class="LC_GRADING_maincontrols">
 INFO  INFO
   
     if (&grade_mode() eq 'regrade') {      if ($env{'request.state'} eq 'construct') {
  $result.=<<INFO;   $result.=<<INFO;
       <input type="submit" name="next" value="$lt{'submit'}" />
   INFO
       } else {
    if (&grade_mode() eq 'regrade' && $env{'request.state'} ne 'construct') {
       $result.=<<INFO;
     <input type="submit" name="cancel" value="$lt{'cancel'}" />      <input type="submit" name="cancel" value="$lt{'cancel'}" />
 INFO  INFO
     }          }
   
     $result.=<<INFO;   $result.=<<INFO;
     <input type="submit" name="next" value="$lt{'done'}" />      <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />      <input type="submit" name="stop" value="$lt{'stop'}" />
   INFO
       }
       $result.=<<INFO;
     <input type="button" name="fail" value="$lt{'fail'}"       <input type="button" name="fail" value="$lt{'fail'}" 
            onclick="javascript:onFailRest()" />             onclick="javascript:onFailRest()" />
   </div>    </div>
   $file_list    $file_list
 INFO  INFO
     return $result;      return $result;
   
 }  }
   
 sub done_screen {  sub done_screen {
     my ($version) = @_;      my ($version) = @_;
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle($env{'request.uri'});
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
     my $files = '<ul>';      my $files = '<ul>';
     my $msg;      my $msg;
     foreach my $file (@files) {      foreach my $file (@files) {
Line 530  sub start_Task { Line 579  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
       &Apache::structuretags::init_problem_globals('Task');
     if ($target ne 'webgrade') {      if ($target ne 'webgrade') {
  &Apache::structuretags::init_problem_globals('Task');  
  &Apache::structuretags::initialize_storage();   &Apache::structuretags::initialize_storage();
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   &Apache::lonhomework::showhash(%Apache::lonhomework::history);
  if ($env{'request.state'} eq 'construct') {   if ($env{'request.state'} eq 'construct') {
Line 553  sub start_Task { Line 602  sub start_Task {
     &Apache::structuretags::page_start($target,$token,$tagstack,      &Apache::structuretags::page_start($target,$token,$tagstack,
        $parstack,$parser,$safeeval,         $parstack,$parser,$safeeval,
        $name,&style($target));         $name,&style($target));
  $result .= '<div class="LC_task">'."\n";  
     }      }
   
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {      if ($target eq 'web' && $env{'request.state'} ne 'construct') {
Line 562  sub start_Task { Line 610  sub start_Task {
     $result.='<form name="gradesubmission" method="post" action="';      $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); }
     $result.=$uri.'">'.&add_grading_button()."</form>";      $result.=$uri.'">'.&add_grading_button()."</form>\n";
     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'})
    || &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
  $result.='<form method="post" name="slotrequest" 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" />'.
Line 583  sub start_Task { Line 632  sub start_Task {
     }      }
  }   }
     }      }
     if ($target eq 'web' && $env{'request.state'} eq 'construct') {      if ($target =~/(web|webgrade)/ && $env{'request.state'} eq 'construct') {
  $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});   $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
     }      }
     if ($target eq 'web'       if ($target eq 'web' 
Line 602  sub start_Task { Line 651  sub start_Task {
   'slot' => $slot_name});    'slot' => $slot_name});
     ($version,$previous)=&get_version();      ($version,$previous)=&get_version();
  }   }
   
    my $status_id = 
       ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
                                               : 'LC_task_take';
    $result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
   
  push(@Apache::inputtags::status,$status);   push(@Apache::inputtags::status,$status);
  $Apache::inputtags::slot_name=$slot_name;   $Apache::inputtags::slot_name=$slot_name;
Line 660  sub start_Task { Line 714  sub start_Task {
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
   
     $result.=&preserve_grade_info();      $result.=&preserve_grade_info();
     $result.=&internal_location();      $result.=&internal_location(); 
     $result.=$form_tag_start.      $result.=$form_tag_start."\t".
  '<input type="hidden" name="submitted" value="yes" />';   '<input type="hidden" name="submitted" value="yes" />';
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
  }   }
Line 669  sub start_Task { Line 723  sub start_Task {
       $target eq 'webgrade') {        $target eq 'webgrade') {
  my $webgrade='yes';   my $webgrade='yes';
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
       $result .= '<div class="LC_task">'."\n";
     $result.= "\n".'<div class="LC_GRADING_task">'."\n".      $result.= "\n".'<div class="LC_GRADING_task">'."\n".
  '<script type="text/javascript"    '<script type="text/javascript" 
                          src="/res/adm/includes/task_grading.js"></script>';                           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');
  }   }
  # FIXME Blast! still need to reorg this, need to reshow the  
         #       queue being reviewed once done with the grade pass...  
         #       Hrrm, vaildation pass should perhaps say 'not_locked'  
         #       perhaps do a search if there is a key that is mine and if  
         #       there isn't reshow the queue....  
  my ($todo,$status_code,$msg)=&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);
     my ($symb,$uname,$udom)=&decode_queue_key($todo);      my ($symb,$uname,$udom)=&decode_queue_key($todo);
     $result.="\n".'<table><tr><td>Found '.      if ($env{'request.state'} eq 'construct') {
  &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';   $symb = $env{'request.uri'};
       }
       $result.="\n".'<p>'.
    &mt('Grading [_1] for [_2] at [_3]',
       &Apache::lonnet::gettitle($symb),$uname,$udom).'</p>';
     $form_tag_start.=      $form_tag_start.=
  '<input type="hidden" name="gradingkey" value="'.   '<input type="hidden" name="gradingkey" value="'.
  &escape($todo).'" />';   &escape($todo).'" />';
Line 761  sub start_Task { Line 816  sub start_Task {
  }   }
     }      }
     if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }      if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
    } elsif ($target eq 'webgrade' 
    && $env{'request.state'} eq 'construct') {
       $result.=$form_tag_start;
       $result.='<input type="hidden" name="webgrade" value="'.
    $webgrade.'" />';
       $result.=&webgrade_standard_info();
  }   }
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.="\n".'<div id="LC_GRADING_criterialist">';      $result.="\n".'<div id="LC_GRADING_criterialist">';
       &Apache::lonxml::startredirection();
       &start_delay();
       $dimension{$top}{'result'}=$result;
       undef($result);
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=$form_tag_start.   $result.=$form_tag_start.
     &Apache::structuretags::problem_edit_header();      &Apache::structuretags::problem_edit_header();
  $Apache::lonxml::warnings_error_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 />";      &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.= &Apache::edit::text_arg('Required number of passed optional elements to pass the Task:','OptionalRequired',$token,10)." <br />\n";
  $result.=$temp;   $result.= &Apache::edit::insertlist($target,$token);
       } elsif ($target eq 'modified') {
    my $constructtag=
       &Apache::edit::get_new_args($token,$parstack,$safeeval,
    'OptionalRequired');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
    }
     } 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 797  sub get_key_todo { Line 869  sub get_key_todo {
     my ($target)=@_;      my ($target)=@_;
     my $todo;      my $todo;
   
       if ($env{'request.state'} eq 'construct') {
    my ($symb,$cid,$udom,$uname) = &Apache::lonnet::whichuser();
    my $gradingkey=&encode_queue_key($symb,$udom,$uname);
    return ($gradingkey);
       }
   
     if (defined($env{'form.reviewasubmission'})) {      if (defined($env{'form.reviewasubmission'})) {
  &Apache::lonxml::debug("review a submission....");   &Apache::lonxml::debug("review a submission....");
  $env{'form.queue'}='reviewqueue';   $env{'form.queue'}='reviewqueue';
Line 822  sub get_key_todo { Line 900  sub get_key_todo {
     if (defined($env{'form.regradeaspecificsubmission'}) &&      if (defined($env{'form.regradeaspecificsubmission'}) &&
  defined($env{'form.gradinguser'})               &&   defined($env{'form.gradinguser'})               &&
  defined($env{'form.gradingdomain'})               ) {   defined($env{'form.gradingdomain'})               ) {
  my ($symb,$cid)=&Apache::lonxml::whichuser();   my ($symb,$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 $uname = $env{'form.gradinguser'};   my $uname = &LONCAPA::clean_username($env{'form.gradinguser'});
  my $udom  = $env{'form.gradingdomain'};   my $udom  = &LONCAPA::clean_domain($env{'form.gradingdomain'});
   
  my $gradingkey=&encode_queue_key($symb,$udom,$uname);   my $gradingkey=&encode_queue_key($symb,$udom,$uname);
   
Line 989  sub end_Task { Line 1067  sub end_Task {
  }   }
  if (!$previous && $status ne 'SHOW_ANSWER' &&   if (!$previous && $status ne 'SHOW_ANSWER' &&
     &show_task($status,$previous)) {      &show_task($status,$previous)) {
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0',$target,1);
     $result.='</form>';   }
   
    $result.='</form>';
   
    if (!$previous && $status ne 'SHOW_ANSWER' &&
       &show_task($status,$previous)) {
     my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});      my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
     $result.=<<DONEBUTTON;      $result.=<<DONEBUTTON;
 <form name="done" method="post" action="$action">  <form name="done" method="post" action="$action">
Line 1002  DONEBUTTON Line 1085  DONEBUTTON
  if (&show_task($status,$previous) &&   if (&show_task($status,$previous) &&
     $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {      $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
     my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};      my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle($env{'request.uri'});
   
     my $start_time;      my $start_time;
   
     my $slot_name=      my $slot_name=
Line 1018  DONEBUTTON Line 1100  DONEBUTTON
     }      }
     $start_time=&Apache::lonlocal::locallocaltime($start_time);      $start_time=&Apache::lonlocal::locallocaltime($start_time);
   
     my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";      my $status = 
    "\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t";
           
       my $dim = $top;
       my %counts = &get_counts($dim,undef,$parstack,
        $safeeval);
       my $question_status ="\n\t<p>".
    &question_status_message(\%counts,-1).
    "</p>\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>';
    $status.=$question_status;
     }      }
     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>';
    $status.=$question_status;
  if (!$previous) {   if (!$previous) {
     $status.=&add_request_another_attempt_button();      $status.=&add_request_another_attempt_button();
  }   }
     }      }
     my $man_count=0;      
     my $opt_count=0;      $status.="\n".'</div>'."\n";
     my $opt_passed=0;  
     foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) {      foreach my $id (@{$dimension{$dim}{'criterias'}}) {
  if ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}   my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
     eq 'N') {   if ($type eq 'dimension') {
     $opt_count++;      $result.=$dimension{$id}{'result'};
     if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') {      next;
  $opt_passed++;  
     }  
  } else {  
     $man_count++;  
  }   }
    my $criteria = 
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},
     [@_]);
    $status .= &layout_web_Criteria($dim,$id,$criteria);
     }      }
       
     my $opt_req=&Apache::lonxml::get_param('OptionalRequired',  
  $parstack,$safeeval);  
     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, 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/;
Line 1058  DONEBUTTON Line 1145  DONEBUTTON
     &Apache::loncommon::end_page({'discussion' => 1});      &Apache::loncommon::end_page({'discussion' => 1});
     }      }
  }   }
  if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {  
    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
       && $status eq 'CAN_ANSWER') {
     my $award='SUBMITTED';      my $award='SUBMITTED';
     &Apache::essayresponse::file_submission("$version.0",'bridgetask',      &Apache::essayresponse::file_submission("$version.0",'bridgetask',
     'portfiles',\$award);      'portfiles',\$award);
Line 1080  DONEBUTTON Line 1179  DONEBUTTON
     &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') {
  my $useslots = &Apache::lonnet::EXT("resource.0.useslots");   &add_to_queue('gradingqueue',\%queue_data);
  if ($useslots =~ /^\s*no\s*$/i) {  
     &add_to_queue('gradingqueue',  
   {'type' => 'Task',  
    'time' => time});  
  } elsif (defined($Apache::inputtags::slot_name)) {  
     &add_to_queue('gradingqueue',  
   {'type' => 'Task',  
    'time' => time,  
    'slot' => $Apache::inputtags::slot_name});  
  }  
     }      }
  } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {  
     &Apache::structuretags::finalize_storage();  
  }   }
  if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes'    if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' 
     && exists($env{'form.cancel'})) {      && exists($env{'form.cancel'})) {
Line 1109  DONEBUTTON Line 1196  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 (keys(%Apache::bridgetask::top_dimensionlist)) {      my $dim = $top;
       foreach my $id (@{$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.$id.status"}=$env{'form.HWVAL_'.$link};
       $Apache::lonhomework::results{"resource.$version.0.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
    } 
  my $status=   my $status=
     $Apache::lonhomework::results{"resource.$version.0.$dim.status"};      $Apache::lonhomework::results{"resource.$version.0.$id.status"};
  my $mandatory=   my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} 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') {
     if ($mandatory) { $mandatory_failed++; }      if ($mandatory) { $mandatory_failed++; }
  } elsif ($status eq 'ungraded') {  
     $ungraded++;  
  } elsif ($status eq 'review') {   } elsif ($status eq 'review') {
     $review++;      $review++;
    } elsif ($status eq 'ungraded') {
       $ungraded++;
  } else {   } else {
     $ungraded++;      $ungraded++;
  }   }
Line 1129  DONEBUTTON Line 1226  DONEBUTTON
     if ($optional_passed < $optional_required) {      if ($optional_passed < $optional_required) {
  $mandatory_failed++;   $mandatory_failed++;
     }      }
     &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::lonxml::debug(" task results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
     $Apache::lonhomework::results{'resource.0.regrader'}=      $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.0.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.0.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.0.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 1172  DONEBUTTON Line 1254  DONEBUTTON
  $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 1197  DONEBUTTON Line 1277  DONEBUTTON
     }      }
     &minimize_storage();      &minimize_storage();
     &Apache::structuretags::finalize_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();
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="</div>";   if (&nest()) {
       &Apache::lonxml::endredirection();
       &end_delay();
       $result.=$dimension{$top}{'result'};
    } else {
       $result.=&Apache::lonxml::endredirection();
    }
    my $dim = $top;
    foreach my $id (@{$dimension{$dim}{'criterias'}} ) {
       my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
       if ($type eq 'dimension') {
    # dimensional 'criteria' don't get assigned grades
    next;
       } else {
    my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
        [@_]);
    $criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
    my $internal_location=&internal_location($id);
    if ($result =~ m/\Q$internal_location\E/) {
       $result=~s/\Q$internal_location\E/$criteria/;
    } else {
       $result.=$criteria;
    }
   
       }
    }
           $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 1220  DONEBUTTON Line 1358  DONEBUTTON
       'Partial Credit Factor');        'Partial Credit Factor');
  $result.=&Apache::response::meta_stores_write('status','string',   $result.=&Apache::response::meta_stores_write('status','string',
       'Bridge Task Status');        'Bridge Task Status');
       } elsif ($target eq 'edit') {
    $result.= &Apache::structuretags::problem_edit_footer();
     }      }
       &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }
Line 1245  sub move_between_queues { Line 1386  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";
     }      }
Line 1268  sub in_queue { Line 1409  sub in_queue {
     if ($queue eq 'none') { return 0; }      if ($queue eq 'none') { return 0; }
     if (!defined($symb) || !defined($cdom) || !defined($cnum)      if (!defined($symb) || !defined($cdom) || !defined($cnum)
  || !defined($udom) || !defined($uname)) {   || !defined($udom) || !defined($uname)) {
  ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();   ($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
  $cnum=$env{'course.'.$cid.'.num'};   $cnum=$env{'course.'.$cid.'.num'};
  $cdom=$env{'course.'.$cid.'.domain'};   $cdom=$env{'course.'.$cid.'.domain'};
     }      }
Line 1287  sub remove_from_queue { Line 1428  sub remove_from_queue {
     if ($queue eq 'none') { return 'ok'; }      if ($queue eq 'none') { return 'ok'; }
     if (!defined($symb) || !defined($cdom) || !defined($cnum)      if (!defined($symb) || !defined($cdom) || !defined($cnum)
  || !defined($udom) || !defined($uname)) {   || !defined($udom) || !defined($uname)) {
  ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();   ($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
  $cnum=$env{'course.'.$cid.'.num'};   $cnum=$env{'course.'.$cid.'.num'};
  $cdom=$env{'course.'.$cid.'.domain'};   $cdom=$env{'course.'.$cid.'.domain'};
     }      }
Line 1312  sub setup_env_for_other_user { Line 1453  sub setup_env_for_other_user {
   
 sub get_queue_data {  sub get_queue_data {
     my ($queue,$udom,$uname)=@_;      my ($queue,$udom,$uname)=@_;
     my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonnet::whichuser();
     if (!$uname || !$udom) {      if (!$uname || !$udom) {
  $uname=$other_uname;   $uname=$other_uname;
  $udom =$other_udom;   $udom =$other_udom;
Line 1358  sub check_queue_for_key { Line 1499  sub check_queue_for_key {
 sub add_to_queue {  sub add_to_queue {
     my ($queue,$user_data)=@_;      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') {      if (!$cid || $env{'request.state'} eq 'construct') {
  return 'no_queue';   return 'no_queue';
     }      }
Line 1396  sub get_limited_classlist { Line 1537  sub get_limited_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'};
   
Line 1421  sub show_queue { Line 1562  sub show_queue {
  }   }
     }      }
   
       $result .= 
    '<p><a href="/adm/flip?postdata=return:">'.
    &mt('Return to resource').'</a></p><hr />'.
    "\n<h3>Current Queue - $queue</h3>";
     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>".   $result.=
       
     &Apache::loncommon::start_data_table().      &Apache::loncommon::start_data_table().
     &Apache::loncommon::start_data_table_row().      &Apache::loncommon::start_data_table_row().
     '<td>'.&mt('Empty').'</td>'.      '<td>'.&mt('Empty').'</td>'.
     &Apache::loncommon::end_data_table_row().      &Apache::loncommon::end_data_table_row().
     &Apache::loncommon::end_data_table();      &Apache::loncommon::end_data_table();
    return $result;
     }      }
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="\n<h3>Current Queue - $title $queue </h3>".      $result.=
  &Apache::loncommon::start_data_table().   &Apache::loncommon::start_data_table().
  &Apache::loncommon::start_data_table_header_row();   &Apache::loncommon::start_data_table_header_row();
     if ($with_selects) { $result.="<th>Status</th><th></th>"; }      if ($with_selects) { $result.="<th>Status</th><th></th>"; }
Line 1441  sub show_queue { Line 1588  sub show_queue {
  &Apache::loncommon::end_data_table_header_row();   &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; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
   
  my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];   my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
   
Line 1475  sub show_queue { Line 1623  sub show_queue {
  my $ekey=&escape($key);   my $ekey=&escape($key);
  my ($action,$description,$status)=('select',&mt('Select'));   my ($action,$description,$status)=('select',&mt('Select'));
  if (exists($queue{"$key\0locked"})) {   if (exists($queue{"$key\0locked"})) {
       my ($locker,$time) = 
    &get_lock_info($queue{"$key\0locked"});
       if ($time) {
    $time = 
       &Apache::lonnavmaps::timeToHumanString($time,
      'start');
       }
     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"});      $status=&mt('Locked by <tt>[_1]</tt> [_2]',$locker,$time);
     if ($me eq $queue{"$key\0locked"}) {      if ($me eq $locker) {
  ($action,$description)=('resume',&mt('Resume'));   ($action,$description)=('resume',&mt('Resume'));
     } else {      } else {
  ($action,$description)=('unlock',&mt('Unlock'));   ($action,$description)=('unlock',&mt('Unlock'));
Line 1520  FORM Line 1675  FORM
     return $result;      return $result;
 }  }
   
   sub section_restricted {
       my ($classlist_entry) = @_;
       my $cid =(&Apache::lonnet::whichuser())[1];
       if (lc($env{'course.'.$cid.'.task_grading'}) eq 'section'
    && $env{'request.course.sec'}
    && $env{'request.course.sec'} ne
         $classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) {
    return 1;
       }
       return 0;
   }
   
 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'};
   
Line 1535  sub get_queue_counts { Line 1702  sub get_queue_counts {
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  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;      my %slot_cache;
     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; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
   
  if ($key=~/locked$/) {   if ($key=~/locked$/) {
     $locks++;      $locks++;
Line 1581  sub decode_queue_key { Line 1750  sub decode_queue_key {
 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'};
     }      }
     my ($key_locked,$value)=      my ($key_locked,$value)=
  &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);   &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
     if ($key_locked eq "$key\0locked") {      if ($key_locked eq "$key\0locked") {
  return $value;   return &get_lock_info($value);
     }      }
     return undef;      return undef;
 }  }
Line 1617  sub pick_from_queue_data { Line 1786  sub pick_from_queue_data {
  if ($key =~ /\0timestamp$/) { 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; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
   
  if ($check_section) {   if ($check_section) {
     my $section =      my $section =
Line 1669  sub pick_from_queue_data { Line 1839  sub pick_from_queue_data {
     return undef;      return undef;
 }  }
   
   sub get_lock_info {
       my ($lock_info) = @_;
       if (wantarray) {
    if (ref($lock_info) eq 'ARRAY') {
       return @{$lock_info};
    } else {
       return ($lock_info);
    }
       } else {
    if (ref($lock_info) eq 'ARRAY') {
       return $lock_info->[0];
    } else {
       return $lock_info;
    }
       }
       return;
   }
   
 sub find_mid_grade {  sub find_mid_grade {
     my ($queue,$symb,$cdom,$cnum)=@_;      my ($queue,$symb,$cdom,$cnum)=@_;
     my $todo=&unescape($env{'form.gradingkey'});      my $todo=&unescape($env{'form.gradingkey'});
Line 1680  sub find_mid_grade { Line 1868  sub find_mid_grade {
     my $regexp="^$symb\0.*\0locked\$";      my $regexp="^$symb\0.*\0locked\$";
     my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     foreach my $key (keys(%locks)) {      foreach my $key (keys(%locks)) {
  my $who=$locks{$key};   my $who= &get_lock_info($locks{$key});
  if ($who eq $me) {   if ($who eq $me) {
     $todo=$key;      $todo=$key;
     $todo=~s/\0locked$//;      $todo=~s/\0locked$//;
Line 1693  sub find_mid_grade { Line 1881  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,time]},
  $cdom,$cnum);   $cdom,$cnum);
     &Apache::lonxml::debug("success $success $todo");      &Apache::lonxml::debug("success $success $todo");
     if ($success eq 'ok') {      if ($success eq 'ok') {
Line 1708  sub lock_key { Line 1896  sub lock_key {
 sub get_queue_symb_status {  sub get_queue_symb_status {
     my ($queue,$symb,$cdom,$cnum) = @_;      my ($queue,$symb,$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 1724  sub get_queue_symb_status { Line 1912  sub get_queue_symb_status {
  next if ($key=~/timestamp$/);   next if ($key=~/timestamp$/);
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  next if (!defined($classlist->{$uname.':'.$udom}));   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
  push(@users,"$uname:$udom");   push(@users,"$uname:$udom");
     }      }
     return @users;      return @users;
Line 1732  sub get_queue_symb_status { Line 1921  sub get_queue_symb_status {
 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);
Line 1808  sub get_from_queue { Line 1997  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');
Line 1937  sub start_ClosingParagraph { Line 2126  sub start_ClosingParagraph {
     if ($target eq 'web') {      if ($target eq 'web') {
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
       } elsif ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
       } elsif ($target eq 'modified') {
     }      }
     return $result;      return $result;
 }  }
Line 1951  sub end_ClosingParagraph { Line 2143  sub end_ClosingParagraph {
     return $result;      return $result;
 }  }
   
   sub insert_ClosingParagraph {
       return '
   <ClosingParagraph>
       <startouttext />
       <endouttext />
   </ClosingParagraph>';
   }
   
 sub get_dim_id {  sub get_dim_id {
     return $Apache::bridgetask::dimension[-1];      if (@Apache::bridgetask::dimension) {
    return $Apache::bridgetask::dimension[-1];
       } else {
    return $top;
       }
 }  }
   
 sub get_id {  sub get_id {
     my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
     my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);      return &Apache::lonxml::get_id($parstack,$safeeval);
     if (!$id) { $id=$Apache::lonxml::curdepth; }  
     return $id;  
 }  }
   
 sub start_Setup {  sub start_Setup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     #undef(%dimension);      my $result;
     my $dim = &get_id($parstack,$safeeval);      my $dim = &get_id($parstack,$safeeval);
     push(@Apache::bridgetask::dimension,$dim);      push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
     return &internal_location($dim);   &Apache::lonxml::startredirection();
       } elsif ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
    $result.= &Apache::edit::text_arg('Id:','id',$token,10).
       &Apache::edit::end_row().
       &Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=
       &Apache::edit::get_new_args($token,$parstack,$safeeval,'id');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
    }
       }
       return $result;
 }  }
   
 {  {
Line 1995  sub start_Dimension { Line 2210  sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $dim = &get_id($parstack,$safeeval);      my $dim = &get_id($parstack,$safeeval);
     my $previous_dim;      my $previous_dim;
     if (@Apache::bridgetask::dimension) {      my $result;
  $previous_dim = $Apache::bridgetask::dimension[-1];      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
  push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},   if (@Apache::bridgetask::dimension) {
      $dim);      $previous_dim = $Apache::bridgetask::dimension[-1];
  if(&skip_dimension_parsing($dim)) {      push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},
     $dimension{$previous_dim}{'criteria.'.$dim} =   $dim);
  $token->[4]      if(&skip_dimension_parsing($dim)) {
  .&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,   $dimension{$previous_dim}{'criteria.'.$dim} =
       $style)      $token->[4]
  .'</'.$tagstack->[-1].'>';      .&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,
  }     $style)
  $dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';      .'</'.$tagstack->[-1].'>';
  $dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=      }
     &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);      $dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';
  push(@{$dimension{$previous_dim}{'criterias'}},$dim);      $dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=
  $dimension{$dim}{'nested'}=$previous_dim;   &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
  &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");      push(@{$dimension{$previous_dim}{'criterias'}},$dim);
     } else {      $dimension{$dim}{'nested'}=$previous_dim;
  $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}=      $dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};
     &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);      
       &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
    } else {
       $dimension{$top}{'depth'}=0;
       $dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
       $dimension{$top}{'criteria.'.$dim.'.mandatory'}=
    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
       push(@{$dimension{$top}{'criterias'}},$dim);
       $dimension{$dim}{'nested'}=$top;
    }
           push(@Apache::bridgetask::dimension,$dim);
    &Apache::lonxml::startredirection();
    if (!&skip_dimension_parsing($dim)) {
       &enable_dimension_parsing($dim);
    }
       } elsif ($target eq 'edit') {
     $result = &Apache::edit::tag_start($target,$token);
    $result.=  
       &Apache::edit::text_arg('Id:','id',$token,10).' '.
       &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
         [['Y', 'Yes'],
          ['N','No'],],
         $token).' <br /> '.
       &Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':',
       'OptionalRequired',$token,4).
       &Apache::edit::end_row().
       &Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=
       &Apache::edit::get_new_args($token,$parstack,$safeeval,
    'id','Mandatory','OptionalRequired');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
    }
     }      }
     push(@Apache::bridgetask::dimension,$dim);      return $result;# &internal_location($dim);
     &Apache::lonxml::startredirection();  
     &enable_dimension_parsing($dim);  
     return &internal_location($dim);  
 }  }
   
 sub start_QuestionText {  sub start_QuestionText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $dim = &get_dim_id();      my $result;
     my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);  
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
    my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
       my $dim = &get_dim_id();
  $dimension{$dim}{'questiontext'}=$text;   $dimension{$dim}{'questiontext'}=$text;
       } elsif ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
       } elsif ($target eq 'modified') {
     }      }
     return '';      return $result;
 }  }
   
 sub end_QuestionText {  sub end_QuestionText {
     return '';      return '';
 }  }
   
   sub insert_QuestionText {
       return '
   <QuestionText>
       <startouttext />
       <endouttext />
   </QuestionText>';
   }
   
 sub get_instance {  sub get_instance {
     my ($dim)=@_;      my ($dim)=@_;
     my $rand_alg=&Apache::lonnet::get_rand_alg();      my $rand_alg=&Apache::lonnet::get_rand_alg();
Line 2080  sub get_instance { Line 2337  sub get_instance {
 sub get_criteria {  sub get_criteria {
     my ($what,$version,$dim,$id) = @_;      my ($what,$version,$dim,$id) = @_;
     my $type = $dimension{$dim}{'criteria.'.$id.'.type'};      my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
     my $prefix = ($type eq 'criteria') ? "$dim.$id"      my $prefix = ($type eq 'criteria' && $dim ne $top) ? "$dim.$id"
                                : "$id";                                                 : "$id";
     my $entry = "resource.$version.0.$prefix.$what";      my $entry = "resource.$version.0.$prefix.$what";
     if (exists($Apache::lonhomework::results{$entry})) {      if (exists($Apache::lonhomework::results{$entry})) {
  return $Apache::lonhomework::results{$entry};   return $Apache::lonhomework::results{$entry};
Line 2089  sub get_criteria { Line 2346  sub get_criteria {
     return $Apache::lonhomework::history{$entry};      return $Apache::lonhomework::history{$entry};
 }  }
   
 {  sub link {
     my $last_link;      my ($id) = @_;
     sub link {      $id =~ s/\./_/g;
  my ($id) = @_;      return 'LC_GRADING_criteria_'.$id;
  $id =~ s/\./_/g;  }
  return 'LC_GRADING_criteria_'.$id;  sub end_Question { return &end_Dimension(@_); }
     }  sub end_Dimension {
     sub end_Question { return &end_Dimension(@_); }      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     sub end_Dimension {      my $result;
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my $dim=&get_id($parstack,$safeeval);
  my $result=&Apache::lonxml::endredirection();      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
  my $dim=&get_id($parstack,$safeeval);   $result=&Apache::lonxml::endredirection();
  if (&skip_dimension_parsing($dim)) {   if (&skip_dimension_parsing($dim)) {
     &disable_dimension_parsing($dim);  
     pop(@Apache::bridgetask::dimension);      pop(@Apache::bridgetask::dimension);
     return;      return;
  }   }
  my $instance=&get_instance($dim);      }
  my $version=&get_version();      my $instance=&get_instance($dim);
  if ($target eq 'web') {      my $version=&get_version();
     $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);      if ($target eq 'web') {
     my @instances = $instance;   $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
     if (&Apache::response::showallfoils()) {   my @instances = $instance;
  @instances = @{$dimension{$dim}{'instances'}};   if (&Apache::response::showallfoils()) {
     }      @instances = @{$dimension{$dim}{'instances'}};
     my $shown_question_text;   }
     foreach my $instance (@instances) {   my $shown_question_text;
  $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},   foreach my $instance (@instances) {
  [@_]);      $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
  $result .= &nested_parse(\$dimension{$dim}{'questiontext'},       [@_]);
  [@_],{'set_dim_id' => undef});      $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
  my $task_status =        [@_],{'set_dim_id' => undef});
     $Apache::lonhomework::history{"resource.$version.0.status"};      my $task_status = 
  if ($task_status ne 'pass' && $task_status ne 'fail') {   $Apache::lonhomework::history{"resource.$version.0.status"};
       if ($task_status ne 'pass' && $task_status ne 'fail') {
     foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},  
     @{$dimension{$dim}{'criterias'}}) {   foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
  my $type = $dimension{$dim}{'criteria.'.$id.'.type'};   @{$dimension{$dim}{'criterias'}}) {
  &Apache::lonxml::debug("$id is $type");      my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
  if ($type eq 'dimension') {      &Apache::lonxml::debug("$id is $type");
     $result.=      if ($type eq 'dimension') {
  &nested_parse(\$dimension{$dim}{'criteria.'.$id},   $result.=
       [@_],{'set_dim_id' => $id});      &nested_parse(\$dimension{$dim}{'criteria.'.$id},
  }    [@_],{'set_dim_id' => $id});
     }  
  } else {  
     my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};  
     my $mandatory='Mandatory';  
     if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {  
  $mandatory='Optional';  
     }  
     my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";  
     if ($dim_status eq 'pass') {  
  $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';  
     }  
     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; }  
     }      }
     $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>";   }
       } else {
     my $internal_location=&internal_location($dim);   my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
     $result=~s/\Q$internal_location\E/$dim_info/;   my $mandatory='Mandatory';
    if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
     foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},      $mandatory='Optional';
     @{$dimension{$dim}{'criterias'}}) {   }
  my $type = $dimension{$dim}{'criteria.'.$id.'.type'};   my $dim_info=
  if ($type eq 'dimension') {      "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
    my $ucquestion = 
       my $question = 
       ('sub' x $dimension{$dim}{'depth'}).'question';
    $ucquestion =~ s/^(.)/uc($1)/e;
    if ($dim_status eq 'pass') {
       $dim_info.='<h3>'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'</h3>';
    }
    if ($dim_status eq 'fail') {
       $dim_info.='<h3>'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'</h3>';
    }
    my %counts = &get_counts($dim,$instance,$parstack,
    $safeeval);
   
    $dim_info.="\n\t<p>"
       .&question_status_message(\%counts,
         $dimension{$dim}{'depth'})
       ."</p>\n</div>\n";
   
    foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
    @{$dimension{$dim}{'criterias'}}) {
       my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
       if ($type eq 'dimension') {
    if (defined($dimension{$id}{'result'})) {
     $result.=$dimension{$id}{'result'};      $result.=$dimension{$id}{'result'};
     next;      next;
  }  
  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 {   } else {
     $mandatory='Optional';      $dim_info .=
  }   &nested_parse(\$dimension{$dim}{'criteria.'.$id},
  if ($status eq 'fail') {        [@_],{'set_dim_id' => $id});
  } elsif ($status eq 'pass') {  
  } else {  
     &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");  
  }   }
  my $status_display=$status;      } else {
  $status_display=~s/^([a-z])/uc($1)/e;   my $criteria =
  $result.=  
     '<div class="LC_'.$status.' LC_criteria"><h4>'  
     .$mandatory.' Criteria</h4><p>';  
  $result.=  
     &nested_parse(\$dimension{$dim}{'criteria.'.$id},      &nested_parse(\$dimension{$dim}{'criteria.'.$id},
   [@_],{'set_dim_id' => $id});    [@_]);
  $result.='</p><p class="LC_grade">'.$status_display.'</p>';   $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
  if ($comment) {  
     $result.='<p class="LC_comment">'.  
  &mt('Comment: [_1]',$comment).'</p>';  
  }  
  $result.='</div>';  
     }      }
  }   }
     }   # puts the results at the end of the dimension
  } elsif ($target eq 'webgrade') {   if ($result =~m{<QuestionGradeInfo\s*/>}) {
     # in case of any side effects that we need      $result=~s{<QuestionGradeInfo\s*/>}{$dim_info};
     &nested_parse(\$dimension{$dim}{'intro'},[@_]);  
     &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);  
     $result.=  
  &nested_parse(\$dimension{$dim}{'questiontext'},[@_],  
       {'set_dim_id'        => undef,  
        'delay_dim_results' => 1});  
     foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},  
     @{$dimension{$dim}{'criterias'}} ) {  
  my $type = $dimension{$dim}{'criteria.'.$id.'.type'};  
  if ($type eq 'dimension') {  
     # dimensional 'criteria' don't get assigned grades  
     $result.=  
  &nested_parse(\$dimension{$dim}{'criteria.'.$id},  
       [@_],{'set_dim_id' => $id});  
     next;  
  }  
   
  my $link=&link($id);  
  my $status= &get_criteria('status',$version,$dim,$id);  
  $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".  
     '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";  
  $result.=  
     &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]);  
   
  $result.='</div>'."\n".  
     '<div class="LC_GRADING_grade">'."\n".  
     '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".  
     '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".  
     '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".  
     '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".  
     '</div>'."\n".  
     '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".  
     '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode(&get_criteria('comment',$version,$dim,$id),'<>"&').'</textarea>'."\n".  
     '</label>'."\n".  
     '<ul class="LC_GRADING_navbuttons">'."\n".  
     '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".  
     '<li><a href="#next_'.$link.'">Next</a></li>'."\n".  
     '</ul>'."\n".  
                     '</div>'."\n";  
  $result.=&grading_history($version,$dim,$id);  
  $last_link=$link;  
     }  
     if (&delay_result()) {  
  &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'}) {  
     my $optional_passed=0;  
     my $mandatory_failed=0;  
     my $ungraded=0;  
     my $review=0;  
   
     $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);  
     $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},  
      [@_]);  
     $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 {   } else {
     $result .=      $result .= $dim_info;
  &nested_parse(\$dimension{$dim}{'criteria.'.$id},  
       [@_],{'set_dim_id' => $id});  
  }   }
  my $status= &get_criteria('status',$version,$dim,$id);   # puts the results at the beginning of the dimension
    # my $internal_location=&internal_location($dim);
  my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');   # $result=~s/\Q$internal_location\E/$dim_info/;
  if ($status eq 'pass') {      }
     if (!$mandatory) { $optional_passed++; }   }
  } elsif ($status eq 'fail') {   if ($result !~ /^\s*$/s) {
     if ($mandatory) { $mandatory_failed++; }      # FIXME? this maybe unneccssary in the future, (CSE101 BT
  } elsif ($status eq 'review') {      # from Fall 2006 geenrate a div that attempts to hide some
     $review++;      # of the output in an odd way, this is a workaround so
  } elsif ($status eq 'ungraded') {      # those old ones will continue to work.  # It puts the
     $ungraded++;      # LC_question div to come after any starting closie div
       # that the dimension produces
       if ($result =~ m{^\s*</div>}) {
    $result =~ s{^(\s*</div>)}
               {$1\n<div id="$dim" class="LC_question">};
       } else {
    $result = "\n".'<div id="'.$dim.'" class="LC_question">'.
       "\n".$result;
       }
       $result .= "\n</div>\n";
    }
       } elsif ($target eq 'webgrade') {
    # in case of any side effects that we need
    &nested_parse(\$dimension{$dim}{'intro'},[@_]);
    &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
    $result.=
       &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
     {'set_dim_id'          => undef,
      'delayed_dim_results' => 1});
    foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
    @{$dimension{$dim}{'criterias'}} ) {
       my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
       if ($type eq 'dimension') {
    # dimensional 'criteria' don't get assigned grades
    $result.=
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},
     [@_],{'set_dim_id' => $id});
    next;
       } else {
    my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
        [@_]);
    $criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
    my $internal_location=&internal_location($id);
    if ($result =~ m/\Q$internal_location\E/) {
       $result =~ s/\Q$internal_location\E/$criteria/;
  } else {   } else {
     $ungraded++;      $result.=$criteria ;
  }   }
     }      }
     # FIXME optional required can apply to only <instance> right now...   }
     my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'};   if (&nest()) {
     if ($opt_req !~ /\S/) {      &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});
  $opt_req=      $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;
     &Apache::lonxml::get_param('OptionalRequired',      undef($result);
        $parstack,$safeeval);   }
  if ($opt_req !~ /\S/) { $opt_req = 0; }      } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
     }   my $optional_passed=0;
     if ($optional_passed < $opt_req) {   my $mandatory_failed=0;
  $mandatory_failed++;   my $ungraded=0;
     }   my $review=0;
     &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) {   $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=   $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
     'review';   [@_]);
     } elsif ($ungraded) {   $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=   [@_],{'set_dim_id' => undef});
     'ungraded';  
     } elsif ($mandatory_failed) {   foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=   @{$dimension{$dim}{'criterias'}}) {
     'fail';      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 (!$mandatory) { $optional_passed++; }
       } elsif ($status eq 'fail') {
    if ($mandatory) { $mandatory_failed++; }
       } elsif ($status eq 'review') {
    $review++;
       } elsif ($status eq 'ungraded') {
    $ungraded++;
     } else {      } else {
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=   $ungraded++;
     'pass';  
     }      }
    }
   
    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++;
    }
    &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) {
       $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
    'review';
    } elsif ($ungraded) {
       $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
    'ungraded';
    } elsif ($mandatory_failed) {
       $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
    'fail';
  } else {   } else {
     # any other targets no output      $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     undef($result);   'pass';
  }   }
       } elsif ($target eq 'edit') {
       } elsif ($target eq 'modified') {
       } else {
    # any other targets no output
    undef($result);
       }
       if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
  &disable_dimension_parsing();   &disable_dimension_parsing();
  pop(@Apache::bridgetask::dimension);   pop(@Apache::bridgetask::dimension);
  return $result;  
     }      }
       return $result;
   }
   
     sub end_Setup {  sub question_status_message {
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($counts,$depth) = @_;
  my $result=&Apache::lonxml::endredirection();      my %req  = ('man' => 'mandatory',
  my $dim=&get_id($parstack,$safeeval);   'opt' => 'optional',);
  my $instance=&get_instance($dim);      my %type = ('cri' => 'criteria',
  my $version=&get_version();   'dim' => ('sub'x($depth+1)).'questions',);
  if ($target eq 'web') {      my @sections;
     @Apache::scripttag::parser_env = @_;      foreach my $req ('man','opt') {
     $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});   foreach my $type ('cri','dim') {
     my @instances = $instance;      if ($counts->{$req.'_'.$type}) {
     if (&Apache::response::showallfoils()) {   push(@sections,
  @instances = @{$dimension{$dim}{'instances'}};       $counts->{$req.'_'.$type.'_passed'}.' of the '.
     }       $counts->{$req.'_'.$type}.' '.
     foreach my $instance (@instances) {       $req{$req}.' '.$type{$type});
  @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 = @_;      my $status = 'You passed ';
     &Apache::scripttag::xmlparse($dimension{$dim}{'intro'});      if (@sections == -1) {
       } elsif (@sections == 1) {
    $status .= $sections[0];
       } elsif (@sections == 2) {
    $status .= $sections[0].' and '.$sections[1];
       } else {
    my $last = pop(@sections);
    $status .= join(', ',@sections).', and '.$last;
       }
       $status .= '.';
       if ($counts->{'opt'}) {
    $status .= ' You were required to pass '.$counts->{'opt_req'}.
       ' optional ';
    if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
       $status .=
    ($counts->{'opt_req'} == 1?'criterion':'criteria');
    } else {
       $status .=
    'component'.($counts->{'opt_req'} == 1?'':'s');
    }
    $status .= '.';
       }
       return $status;
   }
   
   sub get_counts {
       my ($dim,$instance,$parstack,$safeeval) = @_;
       my %counts;
       my @possible = ('man_cri','man_dim',
       'opt_cri','opt_dim',
       'man_cri_passed', 'man_dim_passed',
       'opt_cri_passed', 'opt_dim_passed',
       'man_passed',
       'opt_passed',
       'opt_req');
       foreach my $which (@possible) { $counts{$which} = 0; }
   
       my $version = &get_version();
   
       foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}},
        @{$dimension{$dim}{'criterias'}} ) {
    my $status = &get_criteria('status',$version,$dim,$id);
    my $which;
    if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} 
       eq 'N') {
       $which = 'opt';
    } else {
       $which = 'man';
    }
    $counts{$which}++;
    if ($status eq 'pass') { $counts{$which.'_passed'}++; }
    if ($dimension{$dim}{'criteria.'.$id.'.type'}
       eq 'dimension') {
       $which .= '_dim';
    } else {
       $which .= '_cri';
    }
    $counts{$which}++;
    if ($status eq 'pass') { $counts{$which.'_passed'}++; }
   
   
       }
       if ($counts{'man_dim_passed'} eq $counts{'man_dim'}) {
    $counts{'man_dim_passed'}='all';
       }
       if ($counts{'man_cri_passed'} eq $counts{'man_cri'}) {
    $counts{'man_cri_passed'}='all';
       }
       
       $counts{'opt_req'}=$dimension{$dim}{$instance.'.optionalrequired'};
       if ($counts{'opt_req'} !~ /\S/) {
    $counts{'opt_req'}= &Apache::lonxml::get_param('OptionalRequired',
          $parstack,$safeeval);
    if ($counts{'opt_req'} !~ /\S/) { $counts{'opt_req'} = 0; }
       }
       return %counts;
   }
   
   sub end_Setup {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       my $dim=&get_id($parstack,$safeeval);
       my $instance=&get_instance($dim);
       my $version=&get_version();
       if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
    $result=&Apache::lonxml::endredirection();
       }
       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 = @_;      @Apache::scripttag::parser_env = @_;
     &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});      $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
     @Apache::scripttag::parser_env = @_;      @Apache::scripttag::parser_env = @_;
     &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});      $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
  } else {  
     # any other targets no output  
     undef($result);  
  }   }
  pop(@Apache::bridgetask::dimension);      } elsif ($target eq 'webgrade' 
  return $result;       || $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;
 }  }
   
 sub grading_history {  sub grading_history {
     my ($version,$dim,$id) = @_;      my ($version,$dim,$id) = @_;
     if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
    && !&Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
  return '';   return '';
     }      }
     my ($result,$grader);      my ($result,$grader);
     my $scope="resource.$version.0.$dim.$id";      my $scope="resource.$version.0.";
       $scope .= ($dim ne $top) ? "$dim.$id"
                        : "$id";
     foreach my $t (1..$Apache::lonhomework::history{'version'}) {      foreach my $t (1..$Apache::lonhomework::history{'version'}) {
  if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {   if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
     my ($gname,$gdom) =       my ($gname,$gdom) = 
Line 2398  sub grading_history { Line 2738  sub grading_history {
     $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';      $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
  }   }
  if ($entry) {   if ($entry) {
     $result.= "<li>$grader : $entry </li>";      $result.= "\n\t\t<li>\n\t\t\t$grader :\n\t\t\t $entry \n\t\t</li>";
  }   }
     }      }
     if ($result) {      if ($result) {
  return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';   return "\n\t".'<ul class="LC_GRADING_pastgrading">'.$result.
       "\n\t".'</ul>'."\n";
     }      }
     return '';      return '';
 }  }
Line 2420  sub start_IntroParagraph { Line 2761  sub start_IntroParagraph {
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
  }   }
   
       } elsif ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
       } elsif ($target eq 'modified') {
     }      }
     return $result;      return $result;
 }  }
Line 2431  sub end_IntroParagraph { Line 2775  sub end_IntroParagraph {
     }      }
 }  }
   
   sub insert_IntroParagraph {
       return '
   <IntroParagraph>
       <startouttext />
       <endouttext />
   </IntroParagraph>';
   }
   
 sub start_Instance {  sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $dim = &get_dim_id();      my $dim = &get_dim_id();
Line 2444  sub start_Instance { Line 2796  sub start_Instance {
     if (lc($disabled) eq 'yes') {      if (lc($disabled) eq 'yes') {
  $dimension{$dim}{$id.'.disabled'}='1';   $dimension{$dim}{$id.'.disabled'}='1';
     }      }
     return '';      my $result;
       if ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
    $result.=  
       &Apache::edit::text_arg('Id:','id',$token,10).' '.
       &Apache::edit::select_arg('Instance is Disabled:','Disabled',
         [['no', 'No'],
          ['yes','Yes'],],
         $token)
       .' <br /> '.
       &Apache::edit::text_arg('Required number of passed optional elements to pass the Instance:',
       'OptionalRequired',$token,4)
       .&Apache::edit::end_row().
       &Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=
       &Apache::edit::get_new_args($token,$parstack,$safeeval,
    'id','OptionalRequired','Disabled');
    if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
    }
       }
       return $result;
 }  }
   
 sub end_Instance {  sub end_Instance {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       if ($target eq 'edit') {
    $result = &Apache::edit::tag_end($target,$token);
       }
       return $result;
 }  }
   
 sub start_InstanceText {  sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $dim = &get_dim_id();      my $result;
     my $instance_id=$Apache::bridgetask::instance{$dim}[-1];  
     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);  
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
    my $dim = &get_dim_id();
    my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
  $dimension{$dim}{$instance_id.'.text'}=$text;   $dimension{$dim}{$instance_id.'.text'}=$text;
       } elsif ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
       } elsif ($target eq 'modified') {
     }      }
     return '';      return $result;
 }  }
   
 sub end_InstanceText {  sub end_InstanceText {
     return '';      return '';
 }  }
   
   sub insert_InstanceText {
       return '
   <InstanceText>
       <startouttext />
       <endouttext />
   </InstanceText>';
   }
   
 sub start_Criteria {  sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);      my $result = '';
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
  my $dim = &get_dim_id();   my $dim = &get_dim_id();
  my $id=&get_id($parstack,$safeeval);   my $id=&get_id($parstack,$safeeval);
    if ($target eq 'web' || $target eq 'webgrade') {
       if ($target eq 'webgrade') {
    &Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
    $dimension{$dim}{'result'} .= &internal_location($id);
       } else {
    &Apache::lonxml::debug(" not stashing $dim $id");
    #$result .= &internal_location($id);
       }
    }
  &Apache::lonxml::debug("Criteria $id with $dim");   &Apache::lonxml::debug("Criteria $id with $dim");
  if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {   if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
     my $instance_id=$Apache::bridgetask::instance{$dim}[-1];      my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
Line 2486  sub start_Criteria { Line 2888  sub start_Criteria {
  &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);   &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     push(@{$dimension{$dim}{'criterias'}},$id);      push(@{$dimension{$dim}{'criterias'}},$id);
  }   }
       } elsif ($target eq 'edit') {
    $result .=&Apache::edit::tag_start($target,$token);
    $result.=  
       &Apache::edit::text_arg('Id:','id',$token,10).' '.
       &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
         [['Y', 'Yes'],
          ['N','No'],],
         $token)
       .' <br /> '.&Apache::edit::end_row().
       &Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=
       &Apache::edit::get_new_args($token,$parstack,$safeeval,
    'id','Mandatory');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return '';      return $result;
   }
   
   sub layout_web_Criteria {
       my ($dim,$id,$criteria) = @_;
   
       my $version = &get_version();
       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;
       my $criteria_info.=
    '<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>'
    .$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">'
    ."\n";
       $criteria =~ s/^\s*//s;
       $criteria =~ s/\s*$//s;
       $criteria_info.= $criteria;
       $criteria_info.="\n\t".'</p>'.
    "\n\t".'<p class="LC_grade">'.$status_display.'</p>';
       if ($comment =~ /\w/) {
    $criteria_info.=
       "\n\t".
       '<p class="LC_comment">'.&mt('Comment: [_1]',$comment).'</p>';
       }
       $criteria_info.="\n".'</div>'."\n";
       
       return $criteria_info;
   }
   
   sub layout_webgrade_Criteria {
       my ($dim,$id,$criteria) = @_;
       my $link=&link($id);
       my $version = &get_version();
       my $status  = &get_criteria('status',$version,$dim,$id);
       my %lt = ( 'ungraded' => 'Ungraded',
          'fail'     => 'Fail',
          'pass'     => 'Pass',
          'review'   => 'Review',
          'comment'  => 'Additional Comment for Student',
          );
       %lt = &Apache::lonlocal::texthash(%lt);
       my $comment = &get_criteria('comment',$version,$dim,$id);
       $comment = &HTML::Entities::encode($comment,'<>"&');
       my %checked;
       foreach my $which ('ungraded','fail','pass','review') {
    if ($status eq $which) { $checked{$which} = 'checked="checked"'; }
       }
       if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; }
       my $buttons;
       foreach my $which  ('ungraded','fail','pass','review') {
    $buttons .= <<END_BUTTON;
    <label class="LC_GRADING_$which">
    <input type="radio" name="HWVAL_$link" value="$which" $checked{$which} />
    $lt{$which}
    </label>
   END_BUTTON
       }
       $criteria =~ s/^\s*//s;
       $criteria =~ s/\s*$//s;
       my $result = <<END_CRITERIA;
   <div class="LC_GRADING_criteria">
    <div class="LC_GRADING_criteriatext">
    $criteria
    </div>
    <div class="LC_GRADING_grade">
   $buttons
    </div>
    <label class="LC_GRADING_comment">
    $lt{'comment'}
    <textarea class="LC_GRADING_comment_area" name="HWVAL_comment_$link">$comment</textarea>
    </label>
   </div>
   END_CRITERIA
       $result .= &grading_history($version,$dim,$id);
       return $result;
 }  }
   
 sub end_Criteria {  sub end_Criteria {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       if ($target eq 'edit') {
       } elsif ($target eq 'modified') {
       }
   }
   sub insert_Criteria {
       return '
   <Criteria>
       <CriteriaText>
           <startouttext />
           <endouttext />
       </CriteriaText>
   </Criteria>';
   }
   
   sub start_CriteriaText {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
   
       } elsif ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
       } elsif ($target eq 'modified') {
       }
       return $result;
 }  }
   
   sub end_CriteriaText {
       return '';
   }
   
   sub insert_CriteriaText {
       return '
   <CriteriaText>
       <startouttext />
       <endouttext />
   </CriteriaText>';
   }
   
   sub start_GraderNote {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'webgrade') {
    $result = '<div class="LC_GRADING_gradernote"><b>'.
       &mt('Note to graders:').'</b>';
       } elsif ($target eq 'edit') {
    $result = &Apache::edit::tag_start($target,$token);
       } elsif ($target eq 'modified') {
       } elsif ($target eq 'web' || $target eq 'grade') {
    my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); 
       }
       return $result;
   }
   
   sub end_GraderNote {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
       if ($target eq 'webgrade') {
    return '</div>';
       }
       return;
   }
   
   sub insert_GraderNote {
       return '
   <GraderNote>
       <startouttext />
       <endouttext />
   </GraderNote>';
   }
   
   
 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');
       if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
    $url = "<tr><td colspan=\"2\"><img src=\"$url\" /></td></tr>";
       } else {
    undef($url);
       }
   
     my $name=&Apache::loncommon::plainname($user,$domain);      my $name=&Apache::loncommon::plainname($user,$domain);
           
     my $msg;      my $msg;
     if ($env{'form.proctorpassword'}) {      if ($env{'form.proctorpassword'}) {
  $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")   $msg.='<p><span class="LC_warning">'
     .'</font></p>';      .&mt("Failed to authenticate the proctor.")
       .'</span></p>';
       }
   
       my $valid;
       my @possible_proctors=split(",",$slot->{'proctor'});
       foreach my $proctor (@possible_proctors) {
    if ($proctor =~ /$LONCAPA::username_re:$LONCAPA::domain_re/) {
       $valid = 1;
       last;
    }
       }
       if (!$valid) {
    $msg.='<p><span class="LC_error">'
       .&mt("No valid poctors are defined.")
       .'</span></p>';
     }      }
       
     if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }      if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
       my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
       $uri = &HTML::Entities::encode($uri,'<>&"');
     my $result= (<<ENDCHECKOUT);      my $result= (<<ENDCHECKOUT);
 <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="$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 2525  sub proctor_validation_screen { Line 3117  sub proctor_validation_screen {
       <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>        $url
     </table>      </table>
   </tr></td>    </tr></td>
 </table>  </table>
Removed from v.1.178  
changed lines
  Added in v.1.236

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