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

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

version 1.230, 2007/04/06 21:22:24 version 1.236, 2007/08/03 23:29:57
Line 244  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'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
    || &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})
    ) {
  my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');   my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
  $result.="\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>'.   $result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.
Line 487  sub webgrade_standard_info { Line 489  sub webgrade_standard_info {
     'stop'   => 'Quit Grading',      'stop'   => 'Quit Grading',
     'fail'   => 'Fail Rest',      'fail'   => 'Fail Rest',
     'cancel' => 'Cancel',      'cancel' => 'Cancel',
       'submit' => 'Submit Grades',
     );      );
     %lt=&Apache::lonlocal::texthash(%lt);      %lt=&Apache::lonlocal::texthash(%lt);
   
Line 494  sub webgrade_standard_info { Line 497  sub webgrade_standard_info {
   <div class="LC_GRADING_maincontrols">    <div class="LC_GRADING_maincontrols">
 INFO  INFO
   
     if (&grade_mode() eq 'regrade') {      if ($env{'request.state'} eq 'construct') {
  $result.=<<INFO;   $result.=<<INFO;
       <input type="submit" name="next" value="$lt{'submit'}" />
   INFO
       } else {
    if (&grade_mode() eq 'regrade' && $env{'request.state'} ne 'construct') {
       $result.=<<INFO;
     <input type="submit" name="cancel" value="$lt{'cancel'}" />      <input type="submit" name="cancel" value="$lt{'cancel'}" />
 INFO  INFO
     }          }
   
     $result.=<<INFO;   $result.=<<INFO;
     <input type="submit" name="next" value="$lt{'done'}" />      <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />      <input type="submit" name="stop" value="$lt{'stop'}" />
   INFO
       }
       $result.=<<INFO;
     <input type="button" name="fail" value="$lt{'fail'}"       <input type="button" name="fail" value="$lt{'fail'}" 
            onclick="javascript:onFailRest()" />             onclick="javascript:onFailRest()" />
   </div>    </div>
   $file_list    $file_list
 INFO  INFO
     return $result;      return $result;
   
 }  }
   
 sub done_screen {  sub done_screen {
     my ($version) = @_;      my ($version) = @_;
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle($env{'request.uri'});
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();      my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
     my $files = '<ul>';      my $files = '<ul>';
Line 600  sub start_Task { Line 612  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 619  sub start_Task { Line 632  sub start_Task {
     }      }
  }   }
     }      }
     if ($target eq 'web' && $env{'request.state'} eq 'construct') {      if ($target =~/(web|webgrade)/ && $env{'request.state'} eq 'construct') {
  $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});   $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
     }      }
     if ($target eq 'web'       if ($target eq 'web' 
Line 723  sub start_Task { Line 736  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 799  sub start_Task { Line 816  sub start_Task {
  }   }
     }      }
     if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }      if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
    } elsif ($target eq 'webgrade' 
    && $env{'request.state'} eq 'construct') {
       $result.=$form_tag_start;
       $result.='<input type="hidden" name="webgrade" value="'.
    $webgrade.'" />';
       $result.=&webgrade_standard_info();
  }   }
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.="\n".'<div id="LC_GRADING_criterialist">';      $result.="\n".'<div id="LC_GRADING_criterialist">';
Line 846  sub get_key_todo { Line 869  sub get_key_todo {
     my ($target)=@_;      my ($target)=@_;
     my $todo;      my $todo;
   
       if ($env{'request.state'} eq 'construct') {
    my ($symb,$cid,$udom,$uname) = &Apache::lonnet::whichuser();
    my $gradingkey=&encode_queue_key($symb,$udom,$uname);
    return ($gradingkey);
       }
   
     if (defined($env{'form.reviewasubmission'})) {      if (defined($env{'form.reviewasubmission'})) {
  &Apache::lonxml::debug("review a submission....");   &Apache::lonxml::debug("review a submission....");
  $env{'form.queue'}='reviewqueue';   $env{'form.queue'}='reviewqueue';
Line 1038  sub end_Task { Line 1067  sub end_Task {
  }   }
  if (!$previous && $status ne 'SHOW_ANSWER' &&   if (!$previous && $status ne 'SHOW_ANSWER' &&
     &show_task($status,$previous)) {      &show_task($status,$previous)) {
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0',$target,1);
  }   }
   
  $result.='</form>';   $result.='</form>';
Line 1056  DONEBUTTON Line 1085  DONEBUTTON
  if (&show_task($status,$previous) &&   if (&show_task($status,$previous) &&
     $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {      $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
     my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};      my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle($env{'request.uri'});
   
     my $start_time;      my $start_time;
   
     my $slot_name=      my $slot_name=
Line 1534  sub show_queue { Line 1562  sub show_queue {
  }   }
     }      }
   
       $result .= 
    '<p><a href="/adm/flip?postdata=return:">'.
    &mt('Return to resource').'</a></p><hr />'.
    "\n<h3>Current Queue - $queue</h3>";
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;      my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  return "\n<h3>Current Queue - $queue</h3>".   $result.=
       
     &Apache::loncommon::start_data_table().      &Apache::loncommon::start_data_table().
     &Apache::loncommon::start_data_table_row().      &Apache::loncommon::start_data_table_row().
     '<td>'.&mt('Empty').'</td>'.      '<td>'.&mt('Empty').'</td>'.
     &Apache::loncommon::end_data_table_row().      &Apache::loncommon::end_data_table_row().
     &Apache::loncommon::end_data_table();      &Apache::loncommon::end_data_table();
    return $result;
     }      }
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="\n<h3>Current Queue - $title $queue </h3>".      $result.=
  &Apache::loncommon::start_data_table().   &Apache::loncommon::start_data_table().
  &Apache::loncommon::start_data_table_header_row();   &Apache::loncommon::start_data_table_header_row();
     if ($with_selects) { $result.="<th>Status</th><th></th>"; }      if ($with_selects) { $result.="<th>Status</th><th></th>"; }
Line 1554  sub show_queue { Line 1588  sub show_queue {
  &Apache::loncommon::end_data_table_header_row();   &Apache::loncommon::end_data_table_header_row();
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
   
  my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];   my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
   
Line 1640  FORM Line 1675  FORM
     return $result;      return $result;
 }  }
   
   sub section_restricted {
       my ($classlist_entry) = @_;
       my $cid =(&Apache::lonnet::whichuser())[1];
       if (lc($env{'course.'.$cid.'.task_grading'}) eq 'section'
    && $env{'request.course.sec'}
    && $env{'request.course.sec'} ne
         $classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) {
    return 1;
       }
       return 0;
   }
   
 sub get_queue_counts {  sub get_queue_counts {
     my ($queue)=@_;      my ($queue)=@_;
     my $result;      my $result;
Line 1655  sub get_queue_counts { Line 1702  sub get_queue_counts {
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  return (0,0,0);   return (0,0,0);
     }      }
   
     my ($entries,$ready_to_grade,$locks)=(0,0,0);      my ($entries,$ready_to_grade,$locks)=(0,0,0);
     my %slot_cache;      my %slot_cache;
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
   
  if ($key=~/locked$/) {   if ($key=~/locked$/) {
     $locks++;      $locks++;
  } elsif ($key=~/timestamp$/) {   } elsif ($key=~/timestamp$/) {
Line 1736  sub pick_from_queue_data { Line 1786  sub pick_from_queue_data {
  if ($key =~ /\0timestamp$/) { next; }   if ($key =~ /\0timestamp$/) { next; }
   
  my ($symb,$uname,$udom)=&decode_queue_key($key);   my ($symb,$uname,$udom)=&decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
   
  if ($check_section) {   if ($check_section) {
     my $section =      my $section =
Line 1845  sub lock_key { Line 1896  sub lock_key {
 sub get_queue_symb_status {  sub get_queue_symb_status {
     my ($queue,$symb,$cdom,$cnum) = @_;      my ($queue,$symb,$cdom,$cnum) = @_;
     if (!defined($cdom) || !defined($cnum)) {      if (!defined($cdom) || !defined($cnum)) {
  my (undef,$cid)=&Apache::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 1861  sub get_queue_symb_status { Line 1912  sub get_queue_symb_status {
  next if ($key=~/timestamp$/);   next if ($key=~/timestamp$/);
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  next if (!defined($classlist->{$uname.':'.$udom}));   next if (!defined($classlist->{$uname.':'.$udom}));
    next if (&section_restricted($classlist->{$uname.':'.$udom}));
  push(@users,"$uname:$udom");   push(@users,"$uname:$udom");
     }      }
     return @users;      return @users;
Line 2109  sub get_dim_id { Line 2161  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 2249  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 2664  sub end_Setup { Line 2714  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 2842  sub start_Criteria { Line 2893  sub start_Criteria {
  $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();
Removed from v.1.230  
changed lines
  Added in v.1.236

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