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

Diff for /loncom/homework/bridgetask.pm between versions 1.226 and 1.237

version 1.226, 2007/02/22 21:40:40 version 1.237, 2007/08/09 00:59:16
Line 38  use Apache::lonlocal; Line 38  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::slotrequest();  use Apache::slotrequest();
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
 use lib '/home/httpd/lib/perl/';  
 use LONCAPA;  use LONCAPA;
     
   
Line 245  sub add_grading_button { Line 244  sub add_grading_button {
     my $result="\n\t".'<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.="\n\t".'<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'})) {      my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'});
       my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.
      '/'.$env{'request.course.sec'});
   
       if ($see_all || $see_sec) {
  my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');   my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
  $result.="\n\t".'<table>'."\n\t\t".'<tr>';   $result.="\n\t".'<table>'."\n\t\t".'<tr>';
  $result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.   if ($see_all || (!&section_restricted())) {
     "\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';      $result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.
    "\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';
    } else {
       $result.="\n\t\t\t".'<td rowspan="4">Grading section: </td>'.
    "\n\t\t\t".'<td rowspan="4">'.$env{'request.course.sec'}."\n\t\t\t".'</td>';
    }
  $result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.   $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:").'" /> ';
   
Line 488  sub webgrade_standard_info { Line 496  sub webgrade_standard_info {
     'stop'   => 'Quit Grading',      'stop'   => 'Quit Grading',
     'fail'   => 'Fail Rest',      'fail'   => 'Fail Rest',
     'cancel' => 'Cancel',      'cancel' => 'Cancel',
       'submit' => 'Submit Grades',
     );      );
     %lt=&Apache::lonlocal::texthash(%lt);      %lt=&Apache::lonlocal::texthash(%lt);
   
Line 495  sub webgrade_standard_info { Line 504  sub webgrade_standard_info {
   <div class="LC_GRADING_maincontrols">    <div class="LC_GRADING_maincontrols">
 INFO  INFO
   
     if (&grade_mode() eq 'regrade') {      if ($env{'request.state'} eq 'construct') {
  $result.=<<INFO;   $result.=<<INFO;
       <input type="submit" name="next" value="$lt{'submit'}" />
   INFO
       } else {
    if (&grade_mode() eq 'regrade' && $env{'request.state'} ne 'construct') {
       $result.=<<INFO;
     <input type="submit" name="cancel" value="$lt{'cancel'}" />      <input type="submit" name="cancel" value="$lt{'cancel'}" />
 INFO  INFO
     }          }
   
     $result.=<<INFO;   $result.=<<INFO;
     <input type="submit" name="next" value="$lt{'done'}" />      <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />      <input type="submit" name="stop" value="$lt{'stop'}" />
   INFO
       }
       $result.=<<INFO;
     <input type="button" name="fail" value="$lt{'fail'}"       <input type="button" name="fail" value="$lt{'fail'}" 
            onclick="javascript:onFailRest()" />             onclick="javascript:onFailRest()" />
   </div>    </div>
   $file_list    $file_list
 INFO  INFO
     return $result;      return $result;
   
 }  }
   
 sub done_screen {  sub done_screen {
     my ($version) = @_;      my ($version) = @_;
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle($env{'request.uri'});
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();      my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
     my $files = '<ul>';      my $files = '<ul>';
Line 601  sub start_Task { Line 619  sub start_Task {
     if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }      if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
     $result.=$uri.'">'.&add_grading_button()."</form>\n";      $result.=$uri.'">'.&add_grading_button()."</form>\n";
     my $symb=&Apache::lonnet::symbread();      my $symb=&Apache::lonnet::symbread();
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
    || &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
  $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.   $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
     '<input type="hidden" name="symb" value="'.$symb.'" />'.      '<input type="hidden" name="symb" value="'.$symb.'" />'.
     '<input type="hidden" name="command" value="showslots" />'.      '<input type="hidden" name="command" value="showslots" />'.
Line 611  sub start_Task { Line 630  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'});
  $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.   if (&section_restricted()) {
     '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.      $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
     '<input type="hidden" name="reportSelected" value="grading_analysis" />'.   '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
     '<input type="submit" name="grading" value="'.   '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
     &mt('Show Grading Status').'" />'.   '<input type="submit" name="grading" value="'.
     '</form>';   &mt('Show Grading Status').'" />'.
    '</form>';
    }
     }      }
  }   }
     }      }
     if ($target eq 'web' && $env{'request.state'} eq 'construct') {      if ($target =~/(web|webgrade)/ && $env{'request.state'} eq 'construct') {
  $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});   $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
     }      }
     if ($target eq 'web'       if ($target eq 'web' 
Line 724  sub start_Task { Line 745  sub start_Task {
  if ($todo) {   if ($todo) {
     &setup_env_for_other_user($todo,$safeeval);      &setup_env_for_other_user($todo,$safeeval);
     my ($symb,$uname,$udom)=&decode_queue_key($todo);      my ($symb,$uname,$udom)=&decode_queue_key($todo);
     $result.="\n".'<table><tr><td>Found '.      if ($env{'request.state'} eq 'construct') {
  &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';   $symb = $env{'request.uri'};
       }
       $result.="\n".'<p>'.
    &mt('Grading [_1] for [_2] at [_3]',
       &Apache::lonnet::gettitle($symb),$uname,$udom).'</p>';
     $form_tag_start.=      $form_tag_start.=
  '<input type="hidden" name="gradingkey" value="'.   '<input type="hidden" name="gradingkey" value="'.
  &escape($todo).'" />';   &escape($todo).'" />';
Line 791  sub start_Task { Line 816  sub start_Task {
  $result.='<input type="hidden" name="regrade" value="'.   $result.='<input type="hidden" name="regrade" value="'.
     $env{'form.regrade'}.'" />';      $env{'form.regrade'}.'" />';
     }      }
     if ($env{'form.chosensections'}) {      if ($env{'form.chosensections'} || &section_restricted()) {
  my @chosen_sections=   my @chosen_sections = &get_allowed_sections();
     &Apache::loncommon::get_env_multiple('form.chosensections');  
  foreach my $sec (@chosen_sections) {   foreach my $sec (@chosen_sections) {
     $result.='<input type="hidden" name="chosensections"       $result.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';                                 value="'.$sec.'" />';
  }   }
     }      }
     if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }      if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
    } elsif ($target eq 'webgrade' 
    && $env{'request.state'} eq 'construct') {
       $result.=$form_tag_start;
       $result.='<input type="hidden" name="webgrade" value="'.
    $webgrade.'" />';
       $result.=&webgrade_standard_info();
  }   }
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.="\n".'<div id="LC_GRADING_criterialist">';      $result.="\n".'<div id="LC_GRADING_criterialist">';
Line 847  sub get_key_todo { Line 877  sub get_key_todo {
     my ($target)=@_;      my ($target)=@_;
     my $todo;      my $todo;
   
       if ($env{'request.state'} eq 'construct') {
    my ($symb,$cid,$udom,$uname) = &Apache::lonnet::whichuser();
    my $gradingkey=&encode_queue_key($symb,$udom,$uname);
    return ($gradingkey);
       }
   
     if (defined($env{'form.reviewasubmission'})) {      if (defined($env{'form.reviewasubmission'})) {
  &Apache::lonxml::debug("review a submission....");   &Apache::lonxml::debug("review a submission....");
  $env{'form.queue'}='reviewqueue';   $env{'form.queue'}='reviewqueue';
Line 877  sub get_key_todo { Line 913  sub get_key_todo {
  my $cdom  = $env{'course.'.$cid.'.domain'};   my $cdom  = $env{'course.'.$cid.'.domain'};
  my $uname = &LONCAPA::clean_username($env{'form.gradinguser'});   my $uname = &LONCAPA::clean_username($env{'form.gradinguser'});
  my $udom  = &LONCAPA::clean_domain($env{'form.gradingdomain'});   my $udom  = &LONCAPA::clean_domain($env{'form.gradingdomain'});
   
    if (&section_restricted()) {
       my $classlist=&get_limited_classlist();
       if (!&allow_grade_user($classlist->{$uname.':'.$udom})) {
    return (undef,'not_allowed',
    &mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom));
       }
    }
  my $gradingkey=&encode_queue_key($symb,$udom,$uname);   my $gradingkey=&encode_queue_key($symb,$udom,$uname);
   
  my $queue;   my $queue;
Line 1039  sub end_Task { Line 1082  sub end_Task {
  }   }
  if (!$previous && $status ne 'SHOW_ANSWER' &&   if (!$previous && $status ne 'SHOW_ANSWER' &&
     &show_task($status,$previous)) {      &show_task($status,$previous)) {
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0',$target,1);
  }   }
   
  $result.='</form>';   $result.='</form>';
Line 1057  DONEBUTTON Line 1100  DONEBUTTON
  if (&show_task($status,$previous) &&   if (&show_task($status,$previous) &&
     $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {      $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
     my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};      my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle($env{'request.uri'});
   
     my $start_time;      my $start_time;
   
     my $slot_name=      my $slot_name=
Line 1332  DONEBUTTON Line 1374  DONEBUTTON
  $result.=&Apache::response::meta_stores_write('status','string',   $result.=&Apache::response::meta_stores_write('status','string',
       'Bridge Task Status');        'Bridge Task Status');
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  &Apache::structuretags::reset_problem_globals('Task');   $result.= &Apache::structuretags::problem_edit_footer();
  undef($Apache::lonhomework::parsing_a_task);  
  return ('','no');  
     }      }
     &Apache::structuretags::reset_problem_globals('Task');      &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
Line 1496  sub get_limited_classlist { Line 1536  sub get_limited_classlist {
         }          }
     }      }
   
     if (ref($sections) && !grep('all',@{ $sections })) {      if (ref($sections) && !grep {$_ eq 'all'} (@{ $sections })) {
  foreach my $student (keys(%$classlist)) {   foreach my $student (keys(%$classlist)) {
     my $section  =       my $section  = 
  $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];   $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];
     if (! grep($section,@{ $sections })) {      if (! grep {$_ eq $section} (@{ $sections })) {
  delete($classlist->{$student});   delete($classlist->{$student});
     }      }
  }   }
Line 1516  sub show_queue { Line 1556  sub show_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 @chosen_sections=      my @chosen_sections = &get_allowed_sections();
  &Apache::loncommon::get_env_multiple('form.chosensections');  
   
     my $classlist = &get_limited_classlist(\@chosen_sections);      my $classlist = &get_limited_classlist(\@chosen_sections);
   
Line 1537  sub show_queue { Line 1576  sub show_queue {
  }   }
     }      }
   
       $result .= 
    '<p><a href="/adm/flip?postdata=return:">'.
    &mt('Return to resource').'</a></p><hr />'.
    "\n<h3>Current Queue - $queue</h3>";
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;      my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  return "\n<h3>Current Queue - $queue</h3>".   $result.=
     &Apache::loncommon::start_data_table().      &Apache::loncommon::start_data_table().
     &Apache::loncommon::start_data_table_row().      &Apache::loncommon::start_data_table_row().
     '<td>'.&mt('Empty').'</td>'.      '<td>'.&mt('Empty').'</td>'.
     &Apache::loncommon::end_data_table_row().      &Apache::loncommon::end_data_table_row().
     &Apache::loncommon::end_data_table();      &Apache::loncommon::end_data_table();
    return $result;
     }      }
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="\n<h3>Current Queue - $title $queue </h3>".      $result.=
  &Apache::loncommon::start_data_table().   &Apache::loncommon::start_data_table().
  &Apache::loncommon::start_data_table_header_row();   &Apache::loncommon::start_data_table_header_row();
     if ($with_selects) { $result.="<th>Status</th><th></th>"; }      if ($with_selects) { $result.="<th>Status</th><th></th>"; }
Line 1557  sub show_queue { Line 1601  sub show_queue {
  &Apache::loncommon::end_data_table_header_row();   &Apache::loncommon::end_data_table_header_row();
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
   
  my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];   my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
   
Line 1643  FORM Line 1688  FORM
     return $result;      return $result;
 }  }
   
   sub get_allowed_sections {
       my @chosen_sections;
       if (&section_restricted()) {
    @chosen_sections = ($env{'request.course.sec'});
       } else {
    @chosen_sections =
       &Apache::loncommon::get_env_multiple('form.chosensections');
       }
   
       return @chosen_sections;
   }
   
   sub section_restricted {
       my $cid =(&Apache::lonnet::whichuser())[1];
       return (lc($env{'course.'.$cid.'.task_grading'}) eq 'section'
       && $env{'request.course.sec'} ne '' );
   }
   
   sub allow_grade_user {
       my ($classlist_entry) = @_;
   
       if (&section_restricted()
    && $env{'request.course.sec'} ne
         $classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) {
    return 0;
       }
       return 1;
   }
   
 sub get_queue_counts {  sub get_queue_counts {
     my ($queue)=@_;      my ($queue)=@_;
     my $result;      my $result;
Line 1658  sub get_queue_counts { Line 1732  sub get_queue_counts {
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  return (0,0,0);   return (0,0,0);
     }      }
   
     my ($entries,$ready_to_grade,$locks)=(0,0,0);      my ($entries,$ready_to_grade,$locks)=(0,0,0);
     my %slot_cache;      my %slot_cache;
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
   
  if ($key=~/locked$/) {   if ($key=~/locked$/) {
     $locks++;      $locks++;
  } elsif ($key=~/timestamp$/) {   } elsif ($key=~/timestamp$/) {
Line 1739  sub pick_from_queue_data { Line 1816  sub pick_from_queue_data {
  if ($key =~ /\0timestamp$/) { next; }   if ($key =~ /\0timestamp$/) { next; }
   
  my ($symb,$uname,$udom)=&decode_queue_key($key);   my ($symb,$uname,$udom)=&decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
   
  if ($check_section) {   if ($check_section) {
     my $section =      my $section =
Line 1848  sub lock_key { Line 1926  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::lonnet::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 1864  sub get_queue_symb_status { Line 1942  sub get_queue_symb_status {
  next if ($key=~/timestamp$/);   next if ($key=~/timestamp$/);
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  next if (!defined($classlist->{$uname.':'.$udom}));   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
  push(@users,"$uname:$udom");   push(@users,"$uname:$udom");
     }      }
     return @users;      return @users;
Line 1950  sub get_from_queue { Line 2029  sub get_from_queue {
 sub select_user {  sub select_user {
     my ($symb,$cid)=&Apache::lonnet::whichuser();      my ($symb,$cid)=&Apache::lonnet::whichuser();
   
     my @chosen_sections=      my @chosen_sections = &get_allowed_sections();
  &Apache::loncommon::get_env_multiple('form.chosensections');  
   
     my $classlist = &get_limited_classlist(\@chosen_sections);      my $classlist = &get_limited_classlist(\@chosen_sections);
           
     my $result;      my $result;
Line 2005  sub select_user { Line 2082  sub select_user {
       <input type="submit" name="submit" value="Regrade" />        <input type="submit" name="submit" value="Regrade" />
       $seclist        $seclist
     </form>      </form>
   <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td>    <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt> Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]</td>
   <td>    <td>
 RESULT  RESULT
         }          }
Line 2078  sub start_ClosingParagraph { Line 2155  sub start_ClosingParagraph {
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bodytext=&Apache::lonxml::get_all_text("/closingparagraph",  
    $parser);  
  $result = &Apache::edit::tag_start($target,$token);   $result = &Apache::edit::tag_start($target,$token);
  $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result = $token->[4].&Apache::edit::modifiedfield('/closingparagraph',  
    $parser);  
     }      }
     return $result;      return $result;
 }  }
Line 2099  sub end_ClosingParagraph { Line 2171  sub end_ClosingParagraph {
     return $result;      return $result;
 }  }
   
   sub insert_ClosingParagraph {
       return '
   <ClosingParagraph>
       <startouttext />
       <endouttext />
   </ClosingParagraph>';
   }
   
 sub get_dim_id {  sub get_dim_id {
     if (@Apache::bridgetask::dimension) {      if (@Apache::bridgetask::dimension) {
  return $Apache::bridgetask::dimension[-1];   return $Apache::bridgetask::dimension[-1];
Line 2109  sub get_dim_id { Line 2189  sub get_dim_id {
   
 sub get_id {  sub get_id {
     my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
     my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);      return &Apache::lonxml::get_id($parstack,$safeeval);
     if (!$id) { $id=$Apache::lonxml::curdepth; }  
     return $id;  
 }  }
   
 sub start_Setup {  sub start_Setup {
Line 2199  sub start_Dimension { Line 2277  sub start_Dimension {
  $result.=     $result.=  
     &Apache::edit::text_arg('Id:','id',$token,10).' '.      &Apache::edit::text_arg('Id:','id',$token,10).' '.
     &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',      &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
       [['yes', 'Yes'],        [['Y', 'Yes'],
        ['no','No'],],         ['N','No'],],
       $token).' <br /> '.        $token).' <br /> '.
     &Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':',      &Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':',
     'OptionalRequired',$token,4).      'OptionalRequired',$token,4).
Line 2225  sub start_QuestionText { Line 2303  sub start_QuestionText {
     my $dim = &get_dim_id();      my $dim = &get_dim_id();
  $dimension{$dim}{'questiontext'}=$text;   $dimension{$dim}{'questiontext'}=$text;
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bodytext=&Apache::lonxml::get_all_text("/questiontext",$parser);  
  $result = &Apache::edit::tag_start($target,$token);   $result = &Apache::edit::tag_start($target,$token);
  $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result = $token->[4].&Apache::edit::modifiedfield('/questiontext',  
    $parser);  
     }      }
     return $result;      return $result;
 }  }
Line 2239  sub end_QuestionText { Line 2313  sub end_QuestionText {
     return '';      return '';
 }  }
   
   sub insert_QuestionText {
       return '
   <QuestionText>
       <startouttext />
       <endouttext />
   </QuestionText>';
   }
   
 sub get_instance {  sub get_instance {
     my ($dim)=@_;      my ($dim)=@_;
     my $rand_alg=&Apache::lonnet::get_rand_alg();      my $rand_alg=&Apache::lonnet::get_rand_alg();
Line 2660  sub end_Setup { Line 2742  sub end_Setup {
   
 sub grading_history {  sub grading_history {
     my ($version,$dim,$id) = @_;      my ($version,$dim,$id) = @_;
     if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
    && !&Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
  return '';   return '';
     }      }
     my ($result,$grader);      my ($result,$grader);
Line 2707  sub start_IntroParagraph { Line 2790  sub start_IntroParagraph {
  }   }
   
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bodytext=&Apache::lonxml::get_all_text("/introparagraph",$parser);  
  $result = &Apache::edit::tag_start($target,$token);   $result = &Apache::edit::tag_start($target,$token);
  $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result = $token->[4].&Apache::edit::modifiedfield('/introparagraph',  
    $parser);  
     }      }
     return $result;      return $result;
 }  }
Line 2724  sub end_IntroParagraph { Line 2803  sub end_IntroParagraph {
     }      }
 }  }
   
   sub insert_IntroParagraph {
       return '
   <IntroParagraph>
       <startouttext />
       <endouttext />
   </IntroParagraph>';
   }
   
 sub start_Instance {  sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $dim = &get_dim_id();      my $dim = &get_dim_id();
Line 2780  sub start_InstanceText { Line 2867  sub start_InstanceText {
  my $instance_id=$Apache::bridgetask::instance{$dim}[-1];   my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
  $dimension{$dim}{$instance_id.'.text'}=$text;   $dimension{$dim}{$instance_id.'.text'}=$text;
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bodytext=&Apache::lonxml::get_all_text("/instancetext",$parser);  
  $result = &Apache::edit::tag_start($target,$token);   $result = &Apache::edit::tag_start($target,$token);
  $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result = $token->[4].&Apache::edit::modifiedfield('/instancetext',  
    $parser);  
     }      }
     return $result;      return $result;
 }  }
Line 2794  sub end_InstanceText { Line 2877  sub end_InstanceText {
     return '';      return '';
 }  }
   
   sub insert_InstanceText {
       return '
   <InstanceText>
       <startouttext />
       <endouttext />
   </InstanceText>';
   }
   
 sub start_Criteria {  sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';      my $result = '';
Line 2826  sub start_Criteria { Line 2917  sub start_Criteria {
     push(@{$dimension{$dim}{'criterias'}},$id);      push(@{$dimension{$dim}{'criterias'}},$id);
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  if (0) {  
     $result = &Apache::edit::tag_start($target,$token);  
     my $text=&Apache::lonxml::get_all_text("/criteria",$parser);  
     &Apache::lonnet::logthis("get_all_text criteria \n$text");  
     my $local_parser = HTML::LCParser->new(\$text);  
     $local_parser->xml_mode(1);  
     $local_parser->marked_sections(1);  
     while (1) {  
  my $criteria_text =   
     &Apache::lonxml::get_all_text('gradernote',$local_parser);  
  $result.=  
     &Apache::edit::editfield($token->[1],$criteria_text,'',80,4);  
   
  # check for a <GraderNote> next might be end  
  my $token = $local_parser->get_token();  
  # is the end  
  last if (!$token);  
  my $gradernote = &Apache::lonxml::get_all_text('/gradernote',  
        $local_parser);  
  # purge the end tag  
  my $token = $local_parser->get_token();  
  $gradernote = '<GraderNote>'.$gradernote.'</GraderNote>';  
  @Apache::scripttag::parser_env = @_;  
  $result .=   
     &Apache::edit::end_row().&Apache::edit::start_spanning_row().  
     &Apache::scripttag::xmlparse($gradernote).  
     &Apache::edit::end_row().&Apache::edit::start_spanning_row();  
     }  
  }  
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  $result.=     $result.=  
     &Apache::edit::text_arg('Id:','id',$token,10).' '.      &Apache::edit::text_arg('Id:','id',$token,10).' '.
     &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',      &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
       [['yes', 'Yes'],        [['Y', 'Yes'],
        ['no','No'],],         ['N','No'],],
       $token)        $token)
     .' <br /> '.&Apache::edit::end_row().      .' <br /> '.&Apache::edit::end_row().
     &Apache::edit::start_spanning_row();      &Apache::edit::start_spanning_row();
Line 2960  sub end_Criteria { Line 3022  sub end_Criteria {
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
     }      }
 }  }
   sub insert_Criteria {
       return '
   <Criteria>
       <CriteriaText>
           <startouttext />
           <endouttext />
       </CriteriaText>
   </Criteria>';
   }
   
 sub start_CriteriaText {  sub start_CriteriaText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
Line 2967  sub start_CriteriaText { Line 3038  sub start_CriteriaText {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
   
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bodytext=&Apache::lonxml::get_all_text("/criteriatext",$parser);  
  $result = &Apache::edit::tag_start($target,$token);   $result = &Apache::edit::tag_start($target,$token);
  $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result = $token->[4].&Apache::edit::modifiedfield('/criteriatext',  
    $parser);  
     }      }
     return $result;      return $result;
 }  }
Line 2981  sub end_CriteriaText { Line 3048  sub end_CriteriaText {
     return '';      return '';
 }  }
   
   sub insert_CriteriaText {
       return '
   <CriteriaText>
       <startouttext />
       <endouttext />
   </CriteriaText>';
   }
   
 sub start_GraderNote {  sub start_GraderNote {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
Line 2988  sub start_GraderNote { Line 3063  sub start_GraderNote {
  $result = '<div class="LC_GRADING_gradernote"><b>'.   $result = '<div class="LC_GRADING_gradernote"><b>'.
     &mt('Note to graders:').'</b>';      &mt('Note to graders:').'</b>';
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bodytext=&Apache::lonxml::get_all_text("/gradernote",$parser);  
  $result = &Apache::edit::tag_start($target,$token);   $result = &Apache::edit::tag_start($target,$token);
  $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result = $token->[4].&Apache::edit::modifiedfield('/gradernote',  
    $parser);  
     } elsif ($target eq 'web' || $target eq 'grade') {      } elsif ($target eq 'web' || $target eq 'grade') {
  my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style);    my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); 
     }      }
Line 3009  sub end_GraderNote { Line 3080  sub end_GraderNote {
     return;      return;
 }  }
   
   sub insert_GraderNote {
       return '
   <GraderNote>
       <startouttext />
       <endouttext />
   </GraderNote>';
   }
   
   
 sub proctor_validation_screen {  sub proctor_validation_screen {
     my ($slot) = @_;      my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');      my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
       if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
    $url = "<tr><td colspan=\"2\"><img src=\"$url\" /></td></tr>";
       } else {
    undef($url);
       }
   
     my $name=&Apache::loncommon::plainname($user,$domain);      my $name=&Apache::loncommon::plainname($user,$domain);
           
     my $msg;      my $msg;
     if ($env{'form.proctorpassword'}) {      if ($env{'form.proctorpassword'}) {
  $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")   $msg.='<p><span class="LC_warning">'
     .'</font></p>';      .&mt("Failed to authenticate the proctor.")
       .'</span></p>';
     }      }
   
       my $valid;
       my @possible_proctors=split(",",$slot->{'proctor'});
       foreach my $proctor (@possible_proctors) {
    if ($proctor =~ /$LONCAPA::username_re:$LONCAPA::domain_re/) {
       $valid = 1;
       last;
    }
       }
       if (!$valid) {
    $msg.='<p><span class="LC_error">'
       .&mt("No valid poctors are defined.")
       .'</span></p>';
       }
       
     if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }      if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
       my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
       $uri = &HTML::Entities::encode($uri,'<>&"');
     my $result= (<<ENDCHECKOUT);      my $result= (<<ENDCHECKOUT);
 <h2>Proctor Validation</h2>  <h2>Proctor Validation</h2>
     <p>Your room's proctor needs to validate your access to this resource.</p>      <p>Your room's proctor needs to validate your access to this resource.</p>
     $msg      $msg
 <form name="checkout" method="post" action="$env{'request.uri'}">  <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="validate" value="yes" />  <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />  <input type="hidden" name="submitted" value="yes" />
 <table>  <table>
Line 3043  sub proctor_validation_screen { Line 3145  sub proctor_validation_screen {
       <tr><td>Name:</td><td>$name</td></tr>        <tr><td>Name:</td><td>$name</td></tr>
       <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>        <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
       <tr><td>Usename</td><td>$user:$domain</td></tr>        <tr><td>Usename</td><td>$user:$domain</td></tr>
       <tr><td colspan="2"><img src="$url" /></td></tr>        $url
     </table>      </table>
   </tr></td>    </tr></td>
 </table>  </table>
Removed from v.1.226  
changed lines
  Added in v.1.237

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