Diff for /loncom/homework/bridgetask.pm between versions 1.184.2.4 and 1.220

version 1.184.2.4, 2006/11/06 17:50:17 version 1.220, 2007/01/13 06:19:00
Line 47  BEGIN { Line 47  BEGIN {
 }  }
   
 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 98  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 106  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 225  sub add_previous_version_button { Line 226  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 234  sub add_grading_button { Line 235  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'})) {
  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 271  sub add_grading_button { Line 279  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 295  sub add_request_another_attempt_button { Line 303  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 372  sub nest { Line 381  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 401  sub internal_location { Line 417  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--) {
Line 439  sub submission_time_stamp { Line 455  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 500  sub done_screen { Line 516  sub done_screen {
     my ($version) = @_;      my ($version) = @_;
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle();
     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 575  sub start_Task { Line 591  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 584  sub start_Task { Line 599  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'})) {
  $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.   $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
Line 624  sub start_Task { Line 639  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 682  sub start_Task { Line 702  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 691  sub start_Task { Line 711  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) {
Line 786  sub start_Task { Line 803  sub start_Task {
  }   }
  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.
Line 844  sub get_key_todo { Line 865  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 = $env{'form.gradinguser'};
Line 1012  sub end_Task { Line 1033  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');
     $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 1040  DONEBUTTON Line 1066  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 1091  DONEBUTTON Line 1122  DONEBUTTON
  }   }
   
   
  if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {   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 1130  DONEBUTTON Line 1162  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 1150  DONEBUTTON Line 1192  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) {
Line 1162  DONEBUTTON Line 1204  DONEBUTTON
  $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';
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::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 1178  DONEBUTTON Line 1220  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';
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::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 1235  DONEBUTTON Line 1277  DONEBUTTON
     &Apache::structuretags::finalize_storage();      &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 1286  sub move_between_queues { Line 1354  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 1309  sub in_queue { Line 1377  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 1328  sub remove_from_queue { Line 1396  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 1353  sub setup_env_for_other_user { Line 1421  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 1399  sub check_queue_for_key { Line 1467  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 1437  sub get_limited_classlist { Line 1505  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 1516  sub show_queue { Line 1584  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 1564  FORM Line 1639  FORM
 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 1621  sub decode_queue_key { Line 1696  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 1709  sub pick_from_queue_data { Line 1784  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 1720  sub find_mid_grade { Line 1813  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 1733  sub find_mid_grade { Line 1826  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 1748  sub lock_key { Line 1841  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 1772  sub get_queue_symb_status { Line 1865  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 1848  sub get_from_queue { Line 1941  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 1992  sub end_ClosingParagraph { Line 2085  sub end_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 {
Line 2008  sub start_Setup { Line 2105  sub start_Setup {
     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();      &Apache::lonxml::startredirection();
     return &internal_location($dim);      return;# &internal_location($dim);
 }  }
   
 {  {
Line 2051  sub start_Dimension { Line 2148  sub start_Dimension {
     &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);      &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
  push(@{$dimension{$previous_dim}{'criterias'}},$dim);   push(@{$dimension{$previous_dim}{'criterias'}},$dim);
  $dimension{$dim}{'nested'}=$previous_dim;   $dimension{$dim}{'nested'}=$previous_dim;
    $dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};
   
  &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");   &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
     } else {      } else {
  $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}=   $dimension{$top}{'depth'}=0;
    $dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
    $dimension{$top}{'criteria.'.$dim.'.mandatory'}=
     &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);      &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
    push(@{$dimension{$top}{'criterias'}},$dim);
    $dimension{$dim}{'nested'}=$top;
     }      }
     push(@Apache::bridgetask::dimension,$dim);      push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
     &enable_dimension_parsing($dim);      if (!&skip_dimension_parsing($dim)) {
     return &internal_location($dim);   &enable_dimension_parsing($dim);
       }
       return;# &internal_location($dim);
 }  }
   
 sub start_QuestionText {  sub start_QuestionText {
Line 2120  sub get_instance { Line 2225  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 2129  sub get_criteria { Line 2234  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 {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result=&Apache::lonxml::endredirection();
       my $dim=&get_id($parstack,$safeeval);
       if (&skip_dimension_parsing($dim)) {
    &disable_dimension_parsing($dim);
    pop(@Apache::bridgetask::dimension);
    return;
     }      }
     sub end_Question { return &end_Dimension(@_); }      my $instance=&get_instance($dim);
     sub end_Dimension {      my $version=&get_version();
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      if ($target eq 'web') {
  my $result=&Apache::lonxml::endredirection();   $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
  my $dim=&get_id($parstack,$safeeval);   my @instances = $instance;
  if (&skip_dimension_parsing($dim)) {   if (&Apache::response::showallfoils()) {
     &disable_dimension_parsing($dim);      @instances = @{$dimension{$dim}{'instances'}};
     pop(@Apache::bridgetask::dimension);  
     return;  
  }   }
  my $instance=&get_instance($dim);   my $shown_question_text;
  my $version=&get_version();   foreach my $instance (@instances) {
  if ($target eq 'web') {      $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
     $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);       [@_]);
     my @instances = $instance;      $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
     if (&Apache::response::showallfoils()) {       [@_],{'set_dim_id' => undef});
  @instances = @{$dimension{$dim}{'instances'}};      my $task_status = 
     }   $Apache::lonhomework::history{"resource.$version.0.status"};
     my $shown_question_text;      if ($task_status ne 'pass' && $task_status ne 'fail') {
     foreach my $instance (@instances) {  
  $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},   foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
  [@_]);   @{$dimension{$dim}{'criterias'}}) {
  $result .= &nested_parse(\$dimension{$dim}{'questiontext'},      my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
  [@_],{'set_dim_id' => undef});      &Apache::lonxml::debug("$id is $type");
  my $task_status =       if ($type eq 'dimension') {
     $Apache::lonhomework::history{"resource.$version.0.status"};   $result.=
  if ($task_status ne 'pass' && $task_status ne 'fail') {      &nested_parse(\$dimension{$dim}{'criteria.'.$id},
     [@_],{'set_dim_id' => $id});
     foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},  
     @{$dimension{$dim}{'criterias'}}) {  
  my $type = $dimension{$dim}{'criteria.'.$id.'.type'};  
  &Apache::lonxml::debug("$id is $type");  
  if ($type eq 'dimension') {  
     $result.=  
  &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::lonxml::get_param('Mandatory',$parstack,$safeeval) 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 the above '.$mandatory.' '.$question.'</h3>';
    }
    if ($dim_status eq 'fail') {
       $dim_info.='<h3>'.$ucquestion.' : you did not pass the above '.$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;
    } else {
       $dim_info .=
    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
         [@_],{'set_dim_id' => $id});
  }   }
       } else {
    my $criteria =
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},
     [@_]);
    $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
     }      }
  }   }
     }   # puts the results at the end of the dimension
  } elsif ($target eq 'webgrade') {   $result .= $dim_info;
     # 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;  
  }  
   
  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".   # puts the results at the beginning of the dimension
     '<div class="LC_GRADING_grade">'."\n".   # my $internal_location=&internal_location($dim);
     '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".   # $result=~s/\Q$internal_location\E/$dim_info/;
     '<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".   if ($result !~ /^\s*$/s) {
     '</div>'."\n".      # FIXME? this maybe unneccssary in the future, (CSE101 BT
     '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".      # from Fall 2006 geenrate a div that attempts to hide some
     '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode(&get_criteria('comment',$version,$dim,$id),'<>"&').'</textarea>'."\n".      # of the output in an odd way, this is a workaround so
     '</label>'."\n".      # those old ones will continue to work.  # It puts the
     '<ul class="LC_GRADING_navbuttons">'."\n".      # LC_question div to come after any starting closie div
     '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".      # that the dimension produces
     '<li><a href="#next_'.$link.'">Next</a></li>'."\n".      if ($result =~ m{^\s*</div>}) {
     '</ul>'."\n".   $result =~ s{^(\s*</div>)}
                     '</div>'."\n";              {$1\n<div id="$dim" class="LC_question">};
  $result.=&grading_history($version,$dim,$id);      } else {
  $last_link=$link;   $result = "\n".'<div id="'.$dim.'" class="LC_question">'.
     }      "\n".$result;
     if (&nest()) {  
  &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});  
  $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;  
  undef($result);  
     }      }
  } elsif ($target eq 'grade' && $env{'form.webgrade'}) {      $result .= "\n</div>\n";
     my $optional_passed=0;   }
     my $mandatory_failed=0;      } elsif ($target eq 'webgrade') {
     my $ungraded=0;   # in case of any side effects that we need
     my $review=0;   &nested_parse(\$dimension{$dim}{'intro'},[@_]);
    &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
     $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);   $result.=
     $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},      &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
      [@_]);    {'set_dim_id'          => undef,
     $result .= &nested_parse(\$dimension{$dim}{'questiontext'},     'delayed_dim_results' => 1});
      [@_],{'set_dim_id' => undef});   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'}}) {      if ($type eq 'dimension') {
  my $link=&link($id);   # dimensional 'criteria' don't get assigned grades
    $result.=
  my $type = $dimension{$dim}{'criteria.'.$id.'.type'};      &nested_parse(\$dimension{$dim}{'criteria.'.$id},
  if ($type eq 'criteria') {    [@_],{'set_dim_id' => $id});
     # dimensional 'criteria' don't get assigned grades   next;
     $Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};      } else {
     $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};   my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
  } else {       [@_]);
     $result .=   $criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
  &nested_parse(\$dimension{$dim}{'criteria.'.$id},   my $internal_location=&internal_location($id);
       [@_],{'set_dim_id' => $id});   if ($result =~ m/\Q$internal_location\E/) {
  }      $result =~ s/\Q$internal_location\E/$criteria/;
  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 {
     $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;
   
    $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 {
    $result .=
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},
     [@_],{'set_dim_id' => $id});
     }      }
     &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");      my $status= &get_criteria('status',$version,$dim,$id);
     if ($review) {      
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=      my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
     'review';      if ($status eq 'pass') {
     } elsif ($ungraded) {   if (!$mandatory) { $optional_passed++; }
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=      } elsif ($status eq 'fail') {
     'ungraded';   if ($mandatory) { $mandatory_failed++; }
     } elsif ($mandatory_failed) {      } elsif ($status eq 'review') {
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=   $review++;
     'fail';      } 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';
  }   }
  &disable_dimension_parsing();      } else {
  pop(@Apache::bridgetask::dimension);   # any other targets no output
  return $result;   undef($result);
     }      }
       &disable_dimension_parsing();
       pop(@Apache::bridgetask::dimension);
       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'});  
     }      my $status = 'You passed ';
  } elsif ($target eq 'webgrade'       if (@sections == -1) {
  || $target eq 'grade' && $env{'form.webgrade'}) {      } elsif (@sections == 1) {
     # in case of any side effects that we need   $status .= $sections[0];
     @Apache::scripttag::parser_env = @_;      } elsif (@sections == 2) {
     &Apache::scripttag::xmlparse($dimension{$dim}{'intro'});   $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=&Apache::lonxml::endredirection();
       my $dim=&get_id($parstack,$safeeval);
       my $instance=&get_instance($dim);
       my $version=&get_version();
       if ($target eq 'web') {
    @Apache::scripttag::parser_env = @_;
    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
    my @instances = $instance;
    if (&Apache::response::showallfoils()) {
       @instances = @{$dimension{$dim}{'instances'}};
    }
    foreach my $instance (@instances) {
     @Apache::scripttag::parser_env = @_;      @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 {
Line 2394  sub grading_history { Line 2594  sub grading_history {
  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 2411  sub grading_history { Line 2613  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 2485  sub start_Criteria { Line 2688  sub start_Criteria {
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
  my $dim = &get_dim_id();   my $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 2499  sub start_Criteria { Line 2711  sub start_Criteria {
     $dimension{$dim}{'criteria.'.$id.'.mandatory'}=      $dimension{$dim}{'criteria.'.$id.'.mandatory'}=
  &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);   &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     push(@{$dimension{$dim}{'criterias'}},$id);      push(@{$dimension{$dim}{'criterias'}},$id);
   
     my $version=&get_version();  
     my $task_status =   
  $Apache::lonhomework::history{"resource.$version.0.status"};  
     if ($target eq 'web'   
  && ($task_status eq 'pass' || $task_status eq 'fail')) {  
  my $status= &get_criteria('status', $version,$dim,$id);  
  my $comment=&get_criteria('comment',$version,$dim,$id);  
  my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');  
  if ($mandatory) {  
     $mandatory='Mandatory';  
  } else {  
     $mandatory='Optional';  
  }  
  my $status_display=$status;  
  $status_display=~s/^([a-z])/uc($1)/e;  
  $result.=  
     '<div class="LC_'.$status.' LC_criteria"><h4>'  
     .$mandatory.' Criteria</h4><p>';  
  $result.=  
     &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]);  
  $result.='</p><p class="LC_grade">'.$status_display.'</p>';  
  if ($comment =~ /\w/) {  
     $result.='<p class="LC_comment">'.  
  &mt('Comment: [_1]',$comment).'</p>';  
  }  
  $result.='</div>';  
     }  
  }   }
     }      }
     return $result;      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 {
 }  }
   
Line 2559  sub end_GraderNote { Line 2824  sub end_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');
     my $name=&Apache::loncommon::plainname($user,$domain);      my $name=&Apache::loncommon::plainname($user,$domain);
           

Removed from v.1.184.2.4  
changed lines
  Added in v.1.220


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