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

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

version 1.128.2.12, 2006/06/24 01:32:25 version 1.142, 2006/04/15 01:06:59
Line 66  sub proctor_check_auth { Line 66  sub proctor_check_auth {
           
     my @allowed=split(",",$slot->{'proctor'});      my @allowed=split(",",$slot->{'proctor'});
     foreach my $possible (@allowed) {      foreach my $possible (@allowed) {
  my ($puser,$pdom)=(split('@',$possible));   my ($puser,$pdom)=(split(':',$possible));
  if ($puser eq $user && $pdom eq $domain) {   if ($puser eq $user && $pdom eq $domain) {
     my $authenticated=0;      my $authenticated=0;
     if ( $slot->{'secret'} =~ /\S/ &&      if ( $slot->{'secret'} =~ /\S/ &&
Line 95  sub proctor_check_auth { Line 95  sub proctor_check_auth {
  #setup new version and who did it   #setup new version and who did it
  $Apache::lonhomework::results{'resource.0.version'}=$version;   $Apache::lonhomework::results{'resource.0.version'}=$version;
  $Apache::lonhomework::results{"resource.$version.0.checkedin"}=   $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
     $user.'@'.$domain;      $user.':'.$domain;
  $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=   $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
     $slot_name;      $slot_name;
   
Line 103  sub proctor_check_auth { Line 103  sub proctor_check_auth {
     } elsif ($authenticated && $type eq 'problem') {      } elsif ($authenticated && $type eq 'problem') {
  &Apache::lonxml::debug("authed $slot_name");   &Apache::lonxml::debug("authed $slot_name");
  $Apache::lonhomework::results{"resource.0.checkedin"}=   $Apache::lonhomework::results{"resource.0.checkedin"}=
     $user.'@'.$domain;      $user.':'.$domain;
  $Apache::lonhomework::results{"resource.0.checkedin.slot"}=   $Apache::lonhomework::results{"resource.0.checkedin.slot"}=
     $slot_name;      $slot_name;
     }      }
Line 349  sub webgrade_standard_info { Line 349  sub webgrade_standard_info {
   
     my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',      my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
        'stop' => 'Quit Grading',         'stop' => 'Quit Grading',
        'fail' => 'Fail Rest',  
        );         );
                 
     my $result=<<INFO;      my $result=<<INFO;
   <div class="LC_GRADING_maincontrols">    <div class="LC_GRADING_maincontrols">
     <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'}" />
     <input type="button" name="fail" value="$lt{'fail'}"   
            onclick="javascript:onFailRest()" />  
   </div>    </div>
   $file_list    $file_list
 INFO  INFO
Line 368  sub start_Task { Line 365  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 378  sub start_Task { Line 375  sub start_Task {
     }       } 
   
     $Apache::lonhomework::parsing_a_task=1;      $Apache::lonhomework::parsing_a_task=1;
     #should get back a <html> or the neccesary stuff to start XML/MathML  
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=  
  &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);  
       
     $head_tag_start .= &style($target);  
     $body_tag_start .= '<div class="LC_task">'."\n";  
   
       my $name;
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  $head_tag_start.='<title>'.   $name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
     &Apache::structuretags::get_resource_name($parstack,$safeeval).  
     '</title>';  
     }      }
   
       my ($result,$form_tag_start)=
    &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,
      $parser,$safeeval,$name,&style());
       
       $result .= '<div class="LC_task">'."\n";
   
   
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {      if ($target eq 'web' && $env{'request.state'} ne 'construct') {
  if ($Apache::lonhomework::modifygrades) {   if ($Apache::lonhomework::modifygrades) {
     $body_tag_start.='<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); }
     $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";      $result.=$uri.'">'.&add_grading_button()."</form>";
     my $symb=&Apache::lonnet::symbread();      my $symb=&Apache::lonnet::symbread();
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  $body_tag_start.='<form method="post" 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" />'.
     '<input type="submit" name="requestattempt" value="'.      '<input type="submit" name="requestattempt" value="'.
Line 408  sub start_Task { Line 405  sub start_Task {
  my $target_id =    my $target_id = 
     &Apache::lonstathelpers::make_target_id({symb => $symb,      &Apache::lonstathelpers::make_target_id({symb => $symb,
      part => '0'});       part => '0'});
  $body_tag_start.='<form method="post" name="gradingstatus" action="/adm/statistics">'.   $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
     '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.      '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
     '<input type="hidden" name="reportSelected" value="grading_analysis" />'.      '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
     '<input type="submit" name="grading" value="'.      '<input type="submit" name="grading" value="'.
Line 431  sub start_Task { Line 428  sub start_Task {
  $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';   $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
  &Apache::run::run($expression,$safeeval);   &Apache::run::run($expression,$safeeval);
  &Apache::lonxml::debug("Got $status");   &Apache::lonxml::debug("Got $status");
  $body_tag_start.=&add_previous_version_button($status);   $result.=&add_previous_version_button($status);
  if (!&show_task($status,$previous)) {   if (!&show_task($status,$previous)) {
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>'.$body_tag_start;  
  if ($env{'request.state'} eq 'construct') {   if ($env{'request.state'} eq 'construct') {
     $result.=$form_tag_start;      $result.=$form_tag_start;
  }   }
Line 456  sub start_Task { Line 452  sub start_Task {
     my (undef,undef,$domain,$user)=      my (undef,undef,$domain,$user)=
  &Apache::lonxml::whichuser();   &Apache::lonxml::whichuser();
     my $files = '<ul>';      my $files = '<ul>';
     my $msg;  
     foreach my $file (@files) {      foreach my $file (@files) {
  my $url="/uploaded/$domain/$user/portfolio$file";   my $url="/uploaded/$domain/$user/portfolio$file";
  $file = '<tt>'.$file.'</tt>';   if (! &Apache::lonnet::stat_file($url)) {
       $file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
    } else {
       $file = '<tt>'.$file.'</tt>';
    }
  $files .= '<li>'.$file.'</li>';   $files .= '<li>'.$file.'</li>';
  $msg .= "<p>Submitted file $file</p>\n";  
     }      }
     $files.='</ul>';      $files.='</ul>';
     my $subject = "Submission message for $title";  
     my ($message_status,$comment_status);  
     my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};  
     $setting =~ s/^\s*(\S*)\s*$/$1/;  
     $setting = lc($setting);  
     if ($setting eq 'only_student'  
  || $setting eq 'student_and_user_notes_screen') {  
  $message_status =  
     &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);  
  $message_status = '<p>'.&mt('Message sent to user: [_1]',  
     $message_status).' </p>';  
     }  
     if ($setting eq 'student_and_user_notes_screen') {  
  $comment_status =  
     &Apache::lonmsg::store_instructor_comment($subject.'<br />'.  
       $msg,$user,$domain);  
  $comment_status = '<p>'.&mt('Message sent to instructor: [_1]',  
     $comment_status).' </p>';  
     }  
   
     $result.=<<DONESCREEN;      $result.=<<DONESCREEN;
 <h2>$title</h2>  <h2>$title</h2>
Line 491  sub start_Task { Line 470  sub start_Task {
 <hr />  <hr />
 <p> <a href="/adm/logout">Logout</a> </p>  <p> <a href="/adm/logout">Logout</a> </p>
 <p> <a href="/adm/roles">Change to a different course</a> </p>  <p> <a href="/adm/roles">Change to a different course</a> </p>
 $message_status  
 $comment_status  
 DONESCREEN  DONESCREEN
  } elsif ($status ne 'NOT_YET_VIEWED') {   } elsif ($status ne 'NOT_YET_VIEWED') {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
Line 519  DONESCREEN Line 496  DONESCREEN
  }   }
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     $result.="$head_tag_start</head>  
               $body_tag_start \n";  
       
     $result.=&preserve_grade_info();      $result.=&preserve_grade_info();
     $result.=&internal_location();      $result.=&internal_location();
     $result.=$form_tag_start.      $result.=$form_tag_start.
Line 532  DONESCREEN Line 507  DONESCREEN
       $target eq 'webgrade') {        $target eq 'webgrade') {
  my $webgrade='yes';   my $webgrade='yes';
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.=$head_tag_start.      $result.= "\n".'<div class="LC_GRADING_task">'."\n".
  '</head>'.$body_tag_start.  
  "\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');
Line 618  DONESCREEN Line 591  DONESCREEN
     $result.="\n".'<div id="LC_GRADING_criterialist">';      $result.="\n".'<div id="LC_GRADING_criterialist">';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=$head_tag_start."</head>".$body_tag_start.$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 />";
Line 654  sub get_key_todo { Line 627  sub get_key_todo {
     }      }
   
   
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
   
     #need to try both queues..      #need to try both queues..
     if (defined($env{'form.regradeaspecificsubmission'}) &&      if (defined($env{'form.regradeaspecificsubmission'}) &&
Line 700  sub get_key_todo { Line 673  sub get_key_todo {
  #otherwise (defined($who) && $who ne $me) some else has it...   #otherwise (defined($who) && $who ne $me) some else has it...
  return (undef,'not_allowed',   return (undef,'not_allowed',
  &mt('Another user ([_1]) currently has the record for [_2] locked.',   &mt('Another user ([_1]) currently has the record for [_2] locked.',
     $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'}));      $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
     }      }
   
   
Line 866  DONEBUTTON Line 839  DONEBUTTON
  }   }
     }       } 
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.="\n</div>\n".&Apache::lonxml::xmlend().'</html>';   $result.="\n</div>\n".
       &Apache::loncommon::end_page({'discussion' => 1});
     }      }
  }   }
  if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {   if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
Line 928  DONEBUTTON Line 902  DONEBUTTON
     }      }
     &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");      &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."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') {   if ($env{'form.queue'} eq 'reviewqueue') {
Line 1006  DONEBUTTON Line 980  DONEBUTTON
  #$result.='<input type="submit" name="save" value="'.   #$result.='<input type="submit" name="save" value="'.
  #    &mt('Save Partial Grade and Continue Grading').'" /> ';   #    &mt('Save Partial Grade and Continue Grading').'" /> ';
  $result.='</form>'."\n</div>\n</div>\n".   $result.='</form>'."\n</div>\n</div>\n".
     &Apache::loncommon::endbodytag().'</html>';      &Apache::loncommon::end_page();
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.=&Apache::response::meta_package_write('Task');   $result.=&Apache::response::meta_package_write('Task');
         $result.=&Apache::response::meta_stores_write('solved','string',          $result.=&Apache::response::meta_stores_write('solved','string',
Line 1018  DONEBUTTON Line 992  DONEBUTTON
  $result.=&Apache::response::meta_stores_write('status','string',   $result.=&Apache::response::meta_stores_write('status','string',
       'Bridge Task Status');        'Bridge Task Status');
     }      }
     &Apache::structuretags::reset_problem_globals('Task');  
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }
Line 1045  sub check_queue_unlock { Line 1018  sub check_queue_unlock {
     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::lonxml::whichuser();
     if (!defined($key)) {      if (!defined($key)) {
  $key="$symb\0queue\0$uname\@$udom";   $key="$symb\0queue\0$uname:$udom";
     }      }
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my $who=&queue_key_locked($queue,$key,$cdom,$cnum);      my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
     if  ($who eq $me) {      if  ($who eq $me) {
  return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);   return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
Line 1112  sub get_queue_data { Line 1085  sub get_queue_data {
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonxml::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="$symb\0queue\0$uname\@$udom";      my $todo="$symb\0queue\0$uname:$udom";
     my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);      my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
     if ($key eq $todo && ref($value)) {      if ($key eq $todo && ref($value)) {
  return $value;   return $value;
Line 1158  sub add_to_queue { Line 1131  sub add_to_queue {
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my %data;      my %data;
     $data{"$symb\0queue\0$uname\@$udom"}=$user_data;      $data{"$symb\0queue\0$uname:$udom"}=$user_data;
     return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);      return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
 }  }
   
Line 1207  sub show_queue { Line 1180  sub show_queue {
  my $ekey=&Apache::lonnet::escape($key);   my $ekey=&Apache::lonnet::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 $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>',$queue{"$key\0locked"});
     if ($me eq $queue{"$key\0locked"}) {      if ($me eq $queue{"$key\0locked"}) {
  ($action,$description)=('resume',&mt('Resume'));   ($action,$description)=('resume',&mt('Resume'));
Line 1241  FORM Line 1214  FORM
  }   }
     }      }
     $result.= "<td>".$fullname->{$uname.':'.$udom}.      $result.= "<td>".$fullname->{$uname.':'.$udom}.
  " <tt>($uname\@$udom)</tt> </td>";   " <tt>($uname:$udom)</tt> </td>";
     $result.='<td>Slot: '.$slot.' End time: '.      $result.='<td>Slot: '.$slot.' End time: '.
  &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).   &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
  "</td></tr>";   "</td></tr>";
Line 1288  sub get_queue_counts { Line 1261  sub get_queue_counts {
   
 sub encode_queue_key {  sub encode_queue_key {
     my ($symb,$udom,$uname)=@_;      my ($symb,$udom,$uname)=@_;
     return "$symb\0queue\0$uname\@$udom";      return "$symb\0queue\0$uname:$udom";
 }  }
   
 sub decode_queue_key {  sub decode_queue_key {
     my ($key)=@_;      my ($key)=@_;
     my ($symb,undef,$user) = split("\0",$key);      my ($symb,undef,$user) = split("\0",$key);
     my ($uname,$udom) = split('@',$user);      my ($uname,$udom) = split(':',$user);
     return ($symb,$uname,$udom);      return ($symb,$uname,$udom);
 }  }
   
Line 1358  sub pick_from_queue_data { Line 1331  sub pick_from_queue_data {
 sub find_mid_grade {  sub find_mid_grade {
     my ($queue,$symb,$cdom,$cnum)=@_;      my ($queue,$symb,$cdom,$cnum)=@_;
     my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});      my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     if ($todo) {      if ($todo) {
  my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);   my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
  if ($who eq $me) { return $todo; }   if ($who eq $me) { return $todo; }
Line 1378  sub find_mid_grade { Line 1351  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::lonxml::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 1820  sub get_instance { Line 1793  sub get_instance {
     my $mandatory_failed=0;      my $mandatory_failed=0;
     my $ungraded=0;      my $ungraded=0;
     my $review=0;      my $review=0;
   
     @Apache::scripttag::parser_env = @_;  
     $result.=&Apache::scripttag::xmlparse($dimension{'intro'});  
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  @Apache::scripttag::parser_env = @_;  
  $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.tex  
 t'});  
  my $link=&link($instance,$id);   my $link=&link($instance,$id);
  my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};   my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
  $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};   $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
Line 1878  sub grading_history { Line 1845  sub grading_history {
     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) = 
  split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'});   split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'});
     my $fullname = &Apache::loncommon::plainname($gname,$gdom);      my $fullname = &Apache::loncommon::plainname($gname,$gdom);
     $grader = &Apache::loncommon::aboutmewrapper($fullname,      $grader = &Apache::loncommon::aboutmewrapper($fullname,
  $gname,$gdom);   $gname,$gdom);
Line 1903  sub grading_history { Line 1870  sub grading_history {
 sub start_IntroParagraph {  sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  if ($tagstack->[-2] eq 'Dimension') {   if ($tagstack->[-2] eq 'Dimension') {
     $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);      $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
   
Line 1944  sub start_InstanceText { Line 1911  sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];      my $instance_id=$Apache::bridgetask::instance[-1];
     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);      my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  $dimension{$instance_id.'.text'}=$text;   $dimension{$instance_id.'.text'}=$text;
     }      }
     return '';      return '';
Line 2002  sub proctor_validation_screen { Line 1969  sub proctor_validation_screen {
       <tr><td colspan="2">Student who should be logged in is:</td></tr>        <tr><td colspan="2">Student who should be logged in is:</td></tr>
       <tr><td>Name:</td><td>$name</td></tr>        <tr><td>Name:</td><td>$name</td></tr>
       <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>        <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
       <tr><td>Usename</td><td>$user\@$domain</td></tr>        <tr><td>Usename</td><td>$user:$domain</td></tr>
       <tr><td colspan="2"><img src="$url" /></td></tr>        <tr><td colspan="2"><img src="$url" /></td></tr>
     </table>      </table>
   </tr></td>    </tr></td>
Removed from v.1.128.2.12  
changed lines
  Added in v.1.142

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