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

Diff for /loncom/homework/bridgetask.pm between versions 1.51 and 1.62

version 1.51, 2005/09/20 07:14:23 version 1.62, 2005/10/01 04:06:29
Line 144  sub add_previous_version_button { Line 144  sub add_previous_version_button {
 }  }
   
 sub add_grading_button {  sub add_grading_button {
       my (undef,$cid)=&Apache::lonxml::whichuser();
       my $cnum=$env{'course.'.$cid.'.num'};
       my $cdom=$env{'course.'.$cid.'.domain'};
       my %sections;
       my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections);
       my $size=5;
       if (scalar(keys(%sections)) < 3) {
    $size=scalar(keys(%sections))+2;
       }
       my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";
       $sec_select .= "<option value='all' selected='selected'>all</option>\n";
       foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
    $sec_select .= "<option name=\"$sec\">$sec</option>\n";
       }
       $sec_select .= "<option value='none'>none</option></select>\n";
       
     my $result=' <input type="submit" name="gradeasubmission" value="'.      my $result=' <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.='<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.='<p>Specify a section: '.$sec_select.'</p>';
  $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);   $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
   
  $result.=' <input type="submit" name="reviewagrading" value="'.   $result.=' <input type="submit" name="reviewagrading" value="'.
Line 204  sub preserve_grade_info { Line 221  sub preserve_grade_info {
     return $result;      return $result;
 }  }
   
   sub style {
       return (<<STYLE);
   <style type="text/css">
   .fail, .pass, .neutral {
       position: relative;
       margin : 5px;
       margin-bottom :10px;
       padding : 4px;
       padding-left : 75px;
    border : thin solid;
       font-weight : bolder;
       font-size: smaller;
       font-family: Arial;
       background-color : rgb(255,240,225);
   }
   
   .fail h4, .pass h4 {
    position:absolute;
    left: -4px;
    top: -8px;
    padding:2px;
    margin:0;
    background-color : rgb(255,240,225);
    border : thin solid;
   }
   
   .fail {
    color: red;
   }
   
   .pass {
       color : green;
   }
   
   .neutral {
    color : blue;
   }
   
   .question {
    border : thin solid black;
    padding : 4px;
    margin-bottom : 1em;
   }
   
   .grade {
    font-size: x-large;
    font-family: Arial;
    position:absolute;
    left: 5px;
    top: -5px;
    width: 70px;
   }
   
   div#feedback h1 {
       color : inherit;
   }
   </style>
   STYLE
   
   }
   
   sub show_task {
       my ($status,$previous)=@_;
       if (!$previous && (
          ( $status eq 'CLOSED' ) ||
          ( $status eq 'BANNED') ||
          ( $status eq 'UNAVAILABLE') ||
          ( $status eq 'NOT_IN_A_SLOT') ||
          ( $status eq 'NEEDS_CHECKIN') ||
          ( $status eq 'WAITING_FOR_GRADE') ||
          ( $status eq 'INVALID_ACCESS') )) {
    return 0;
       }
       return 1;
   }
   
   sub internal_location {
       my ($id)=@_;
       return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
   }
   
   sub submission_time_stamp {
       my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
       my $submissiontime;
       my $version=$Apache::lonhomework::history{'resource.version'};
       for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
    if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
       $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
    }
       }
       my $result;
       if ($submissiontime) {
    my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
    my %slot=&Apache::lonnet::get_slot($slot_name);
    my $diff = $slot{'endtime'} - $submissiontime;
    my ($color,$when)=('red','after');
    if ($diff > 0) { ($color,$when)=('green','before'); }
    my $info;
    if ($diff%60) { $info=($diff%60).' seconds'; }
    $diff=int($diff/60);
    if ($diff%60) { $info=($diff%60).' minutes '.$info; }
    $diff=int($diff/60);
    if ($diff) {    $info=$diff.' hours '.$info; }
    $result='<p><font color="'.$color.'">'.
       &mt('Student submitted [_1] [_2] the deadline. 
                    (Submission was at [_3], end of period was [_4].)',
    $info,$when,scalar(localtime($submissiontime)),
    scalar(localtime($slot{'endtime'}))).
    '</font></p>';
       }
       return $result;
   }
   
 sub start_Task {  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
Line 247  sub start_Task { Line 377  sub start_Task {
  &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);   $body_tag_start.=&add_previous_version_button($status);
  if (!$previous && (   if (!&show_task($status,$previous)) {
    ( $status eq 'CLOSED' ) ||  
    ( $status eq 'BANNED') ||  
    ( $status eq 'UNAVAILABLE') ||  
    ( $status eq 'NOT_IN_A_SLOT') ||  
    ( $status eq 'NEEDS_CHECKIN') ||  
    ( $status eq 'WAITING_FOR_GRADE') ||  
    ( $status eq 'INVALID_ACCESS') )) {  
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>'.$body_tag_start;   $result.= $head_tag_start.'</head>'.$body_tag_start;
Line 291  sub start_Task { Line 414  sub start_Task {
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);      my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
     $result.="$head_tag_start<title>$name</title></head>      $result.="$head_tag_start<title>$name</title></head>
               $body_tag_start \n";                $body_tag_start \n".&style();
           
     my ($version,$previous)=&get_version();      $result.=&preserve_grade_info();
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {      $result.=&internal_location();
  $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';  
  if (!$previous) {  
     $result.=&add_request_another_attempt_button();  
  }  
     }  
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {  
  $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';  
     }  
     $result.=$form_tag_start.      $result.=$form_tag_start.
  '<input type="hidden" name="submitted" value="yes" />';   '<input type="hidden" name="submitted" value="yes" />';
     $result.=&preserve_grade_info();      &Apache::lonxml::startredirection();
   
  }   }
     } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||      } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
       $target eq 'webgrade') {        $target eq 'webgrade') {
Line 323  sub start_Task { Line 437  sub start_Task {
         #       there isn't reshow the queue....          #       there isn't reshow the queue....
  my ($todo,$status_code)=&get_key_todo($target);   my ($todo,$status_code)=&get_key_todo($target);
   
  &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");  
  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);
Line 365  sub start_Task { Line 478  sub start_Task {
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
  }   }
  if ($target eq 'webgrade' && defined($env{'form.queue'})) {   if ($target eq 'webgrade' && defined($env{'form.queue'})) {
       if ($webgrade eq 'yes') {
    $result.=&submission_time_stamp();
       }
     $result.=$form_tag_start;      $result.=$form_tag_start;
     $result.='<input type="hidden" name="webgrade" value="'.      $result.='<input type="hidden" name="webgrade" value="'.
  $webgrade.'" />';   $webgrade.'" />';
     $result.='<input type="hidden" name="queue" value="'.      $result.='<input type="hidden" name="queue" value="'.
  $env{'form.queue'}.'" />';   $env{'form.queue'}.'" />';
       if ($env{'form.regrade'}) {
    $result.='<input type="hidden" name="regrade" value="'.
       $env{'form.regrade'}.'" />';
       }
       if ($env{'form.chosensections'}) {
    my @chosen_sections=
       &Apache::loncommon::get_env_multiple('form.chosensections');
    foreach my $sec (@chosen_sections) {
       $result.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
    }
       }
  }   }
     } else {      } else {
  # page_start returned a starting result, delete it if we don't need it   # page_start returned a starting result, delete it if we don't need it
Line 383  sub get_key_todo { Line 511  sub get_key_todo {
     my $todo;      my $todo;
   
     if (defined($env{'form.reviewasubmission'})) {      if (defined($env{'form.reviewasubmission'})) {
  &Apache::lonnet::logthis("review a submission....");   &Apache::lonxml::debug("review a submission....");
  $env{'form.queue'}='reviewqueue';   $env{'form.queue'}='reviewqueue';
  return (undef,'show_list');   return (undef,'show_list');
     }      }
Line 414  sub get_key_todo { Line 542  sub get_key_todo {
  if ($env{'form.stop'}) {   if ($env{'form.stop'}) {
     return (undef,'stop');      return (undef,'stop');
  } elsif ($env{'form.next'}) {   } elsif ($env{'form.next'}) {
     return (undef,'show_list');      return (undef,'select_user');
  }   }
     }      }
     return ($gradingkey,'selected');      return ($gradingkey,'selected');
  } else {   } else {
     return (undef,'show_list');      return (undef,'select_user');
  }   }
     }      }
     if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})      if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
Line 482  sub end_Task { Line 610  sub end_Task {
     ($target eq 'answer') || ($target eq 'tex')      ($target eq 'answer') || ($target eq 'tex')
    ) {     ) {
     if ($target eq 'web') {      if ($target eq 'web') {
    if (&show_task($status,$previous)) {
       $result.=&Apache::lonxml::endredirection();
    }
  if ($status eq 'CAN_ANSWER' && !$previous) {   if ($status eq 'CAN_ANSWER' && !$previous) {
     $result.="\n".'<table border="1">'.      $result.="\n".'<table border="1">'.
  &Apache::inputtags::file_selector("$version.0",   &Apache::inputtags::file_selector("$version.0",
Line 493  sub end_Task { Line 624  sub end_Task {
   "</table>";    "</table>";
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
  }   }
    if (&show_task($status,$previous) &&
       $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
       my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
       my $title=&Apache::lonnet::gettitle();
       my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
       my $start_time=
    &Apache::lonlocal::locallocaltime($slot{'starttime'});
   
       my $status;
       $status.="\n<div class='$bt_status'>\n";
       
       if ($bt_status eq 'pass')  {
    $status.='<h2>You passed the '.$title.' given on '.
       $start_time.'.</h2>';
       }
       if ($bt_status eq 'fail')  {
    $status.='<h2>You did not pass the '.$title.' given on '.
       $start_time.'.</h2>';
    if (!$previous) {
       $status.=&add_request_another_attempt_button();
    }
       }
       my $man_count=0;
       my $opt_count=0;
       my $opt_passed=0;
       foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
    if ($Apache::bridgetask::dimensionmandatory{$dim_id}
       eq 'N') {
       $opt_count++;
       if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {
    $opt_passed++;
       }
    } else {
       $man_count++;
    }
       }
       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 on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n";
   
       my $internal_location=&internal_location();
       $result=~s/\Q$internal_location\E/$status/;
    }
     }       } 
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  $result.=&Apache::lonxml::xmlend().'</html>';   $result.=&Apache::lonxml::xmlend().'</html>';
Line 577  sub end_Task { Line 752  sub end_Task {
  &remove_from_queue($env{'form.queue'});    &remove_from_queue($env{'form.queue'}); 
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
  $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=  
     $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};   if ($env{'form.regrade'} ne 'yes') {
  &Apache::grades::version_portfiles(      $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
  \%Apache::lonhomework::results,   $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
  ["$version.0.bridgetask"],$courseid,      &Apache::grades::version_portfiles(
  $symb,$udom,$uname,         \%Apache::lonhomework::results,
  ["$version.0.bridgetask"]);         ["$version.0.bridgetask"],$courseid,
          $symb,$udom,$uname,
          ["$version.0.bridgetask"]);
    }
     } else {      } else {
  $Apache::lonhomework::results{"resource.$version.status"}='pass';   $Apache::lonhomework::results{"resource.$version.status"}='pass';
  $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
Line 592  sub end_Task { Line 770  sub end_Task {
  &remove_from_queue($env{'form.queue'});   &remove_from_queue($env{'form.queue'});
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
  $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=   if ($env{'form.regrade'} ne 'yes') {
     $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};      $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
  &Apache::grades::version_portfiles(   $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
  \%Apache::lonhomework::results,      &Apache::grades::version_portfiles(
  ["$version.0.bridgetask"],$courseid,         \%Apache::lonhomework::results,
  $symb,$udom,$uname,         ["$version.0.bridgetask"],$courseid,
  ["$version.0.bridgetask"]);         $symb,$udom,$uname,
          ["$version.0.bridgetask"]);
    }
     }      }
     $Apache::lonhomework::results{"resource.status"}=      $Apache::lonhomework::results{"resource.status"}=
  $Apache::lonhomework::results{"resource.$version.status"};   $Apache::lonhomework::results{"resource.$version.status"};
Line 715  sub check_queue_for_key { Line 895  sub check_queue_for_key {
  if (defined($results{"$todo\0locked"})) {   if (defined($results{"$todo\0locked"})) {
     return 'locked';      return 'locked';
  }   }
    my $slot=$results{$todo}->[0];
    my %slot_data=&Apache::lonnet::get_slot($slot);
    if ($slot_data{'endtime'} > time) { 
       return 'in_progress';
    }
  return 'enqueued';   return 'enqueued';
     }      }
     return undef;      return undef;
Line 737  sub show_queue { Line 922  sub show_queue {
     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 @chosen_sections=
    &Apache::loncommon::get_env_multiple('form.chosensections');
       &Apache::grades::init_perm();
       my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
       &Apache::grades::reset_perm();
   
     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;
Line 747  sub show_queue { Line 939  sub show_queue {
     if ($with_selects) { $result.="<th></th>"; }      if ($with_selects) { $result.="<th></th>"; }
     $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";      $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
    my ($symb,$uname,$udom) = &decode_queue_key($key);
    if (!defined($classlist->{$uname.':'.$udom})) { next; }
  if ($key=~/locked$/ && !$with_selects) {   if ($key=~/locked$/ && !$with_selects) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);  
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="<tr><td>$title</td><td>$uname</td>";      $result.="<tr><td>$title</td><td>$uname</td>";
     $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';      $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
Line 759  sub show_queue { Line 952  sub show_queue {
     $result.='<td>last queue modification time</td><td>'.      $result.='<td>last queue modification time</td><td>'.
  &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";   &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
  } elsif ($key!~/(timestamp|locked)$/) {   } elsif ($key!~/(timestamp|locked)$/) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);  
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="<tr>";      $result.="<tr>";
     my $slot=$queue{$key}->[0];      my $slot=$queue{$key}->[0];
Line 775  sub show_queue { Line 967  sub show_queue {
  ($action,$description)=('unlock',&mt('Unlock'));   ($action,$description)=('unlock',&mt('Unlock'));
     }      }
  }   }
    my $seclist;
    foreach my $sec (@chosen_sections) {
       $seclist.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
    }
  if (time > $slot_data{'endtime'}) {   if (time > $slot_data{'endtime'}) {
     $result.=(<<FORM);      $result.=(<<FORM);
 <td>  <td>
Line 785  sub show_queue { Line 982  sub show_queue {
  <input type="hidden" name="webgrade" value="no" />   <input type="hidden" name="webgrade" value="no" />
  <input type="hidden" name="queuemode" value="selected" />   <input type="hidden" name="queuemode" value="selected" />
  <input type="submit" name="submit" value="$description" />   <input type="submit" name="submit" value="$description" />
    $seclist
 </form>  </form>
 </td>  </td>
 FORM  FORM
Line 991  sub select_user { Line 1189  sub select_user {
     my ($symb,$cid)=&Apache::lonxml::whichuser();      my ($symb,$cid)=&Apache::lonxml::whichuser();
     my $result.='<table border="1">';      my $result.='<table border="1">';
   
       my @chosen_sections=
    &Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();      &Apache::grades::init_perm();
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);      my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
     &Apache::grades::reset_perm();      &Apache::grades::reset_perm();
   
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {      foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
  my ($uname,$udom) = split(/:/,$student);   my ($uname,$udom) = split(/:/,$student);
   
  my %status = &get_student_status($symb,$cid,$udom,$uname);   my %status = &get_student_status($symb,$cid,$udom,$uname);
  my $queue = 'none';   my $queue = 'none';
  if ($status{'reviewqueue'} eq 'enqueued') {   my $cannot_grade;
    if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
     $queue = 'reviewqueue';      $queue = 'reviewqueue';
  } elsif ($status{'gradingqueue'} eq 'enqueued') {      if ($status{'reviewqueue'} eq 'in_progress') {
    $cannot_grade=1;
       }
    } elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) {
     $queue = 'gradingqueue';      $queue = 'gradingqueue';
       if ($status{'gradingqueue'} eq 'in_progress') {
    $cannot_grade=1;
       }
  }   }
  my $todo =    my $todo = 
     &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));      &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
  $result.=<<RESULT;   if ($cannot_grade) {
       $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.
    '</td><td>';
    } else {
       my $seclist;
       foreach my $sec (@chosen_sections) {
    $seclist.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
       }
       $result.=<<RESULT;
 <tr>  <tr>
   <td>    <td>
     <form method="POST">      <form method="POST">
       <input type="hidden" name="gradingkey" value="$todo" />        <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />        <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />        <input type="hidden" name="webgrade" value="no" />
      <input type="submit" name="submit" value="Regrade" />        <input type="hidden" name="regrade" value="yes" />
         <input type="submit" name="submit" value="Regrade" />
         $seclist
     </form>      </form>
   <td>$fullname->{$student}</td>    <td>$fullname->{$student}</td>
   <td>    <td>
 RESULT  RESULT
           }
         if ($status{'status'} eq 'pass') {          if ($status{'status'} eq 'pass') {
     $result .= '<font color="green">'.&mt('Passed').'</font>';      $result .= '<font color="green">'.&mt('Passed').'</font>';
  } elsif ($status{'status'} eq 'fail') {   } elsif ($status{'status'} eq 'fail') {
Line 1040  RESULT Line 1259  RESULT
     $result .= &mt('Awaiting Review');      $result .= &mt('Awaiting Review');
  } elsif ($status{'reviewqueue'} eq 'locked') {   } elsif ($status{'reviewqueue'} eq 'locked') {
     $result .= &mt('Under Review');      $result .= &mt('Under Review');
    } elsif ($status{'reviewqueue'} eq 'in_progress') {
       $result .= &mt('Still being worked on.');
  } elsif ($status{'gradingqueue'} eq 'enqueued') {   } elsif ($status{'gradingqueue'} eq 'enqueued') {
     $result .= &mt('Awaiting Grading');      $result .= &mt('Awaiting Grading');
  } elsif ($status{'gradingqueue'} eq 'locked') {   } elsif ($status{'gradingqueue'} eq 'locked') {
     $result .= &mt('Being Graded');      $result .= &mt('Being Graded');
    } elsif ($status{'gradingqueue'} eq 'in_progress') {
       $result .= &mt('Still being worked on.');
  } else {   } else {
     $result.="&nbsp;";      $result.="&nbsp;";
  }   }
Line 1105  sub start_Dimension { Line 1328  sub start_Dimension {
     undef(@Apache::bridgetask::instance);      undef(@Apache::bridgetask::instance);
     $Apache::bridgetask::dimensionmandatory{$dim_id}=      $Apache::bridgetask::dimensionmandatory{$dim_id}=
  &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);   &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     return '';      &Apache::lonxml::startredirection();
       return &internal_location($dim_id);
 }  }
   
 sub get_instance {  sub get_instance {
Line 1121  sub get_instance { Line 1345  sub get_instance {
     my $last_link;      my $last_link;
     sub end_Dimension {      sub end_Dimension {
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
  my $result;   my $result=&Apache::lonxml::endredirection();
  my $dim=&get_id($parstack,$safeeval);   my $dim=&get_id($parstack,$safeeval);
  my $instance=&get_instance();   my $instance=&get_instance();
  my $version=&get_version();   my $version=&get_version();
Line 1132  sub get_instance { Line 1356  sub get_instance {
     $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});      $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||      if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
  $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {   $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
   
    my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
    my $mandatory='Mandatory';
    if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
       $mandatory='Optional';
    }
    my $dim_info="<div class='$dim_status'>\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 $opt_count=0;
    my $opt_passed=0;
    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
       if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
    eq 'N') {
    $opt_count++;
    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
       $opt_passed++;
    }
       } else {
    $man_count++;
       }
    }
    my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
          $parstack,$safeeval);
    if ($opt_req !~ /\S/) { $opt_req='0'; }
    $dim_info.="\n<p>".&mt('You passed all of the mandatory components and [_1] of the [_2] optional components, of which you were required to pass [_3].',$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
   
    my $internal_location=&internal_location($dim);
    $result=~s/\Q$internal_location\E/$dim_info/;
   
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {   foreach my $id (@{$dimension{$instance.'.criterias'}}) {
     my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};      my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
     my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};      my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
     $result.='<table border="1"><tr><td>';      my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
       if ($mandatory) {
    $mandatory='Mandatory';
       } else {
    $mandatory='Optional';
       }
     if ($status eq 'fail') {      if ($status eq 'fail') {
  $result.='<font color="red">'.&mt('Did not pass').'</font>';  
     } elsif ($status eq 'pass') {      } elsif ($status eq 'pass') {
  $result.='<font color="green">'.&mt('Passed').'</font>';  
     } else {      } else {
  &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");   &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
     }      }
     $result.='</td></tr><tr><td>';      my $status_display=$status;
       $status_display=~s/^([a-z])/uc($1)/e;
       @Apache::scripttag::parser_env = @_;
       $result.='<div class="'.$status.'"><h4>'.$mandatory.
    ' Criteria</h4><p>';
       @Apache::scripttag::parser_env = @_;
       $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
       $result.='</p><p class="grade">'.$status_display.'</p>';
     if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {      if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
  $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';   $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
     }      }
     $result.=$dimension{$instance.'.criteria.'.$id}.      $result.='</div>';
  '</td></tr></table>';  
  }   }
     }      }
  } elsif ($target eq 'webgrade') {   } elsif ($target eq 'webgrade') {
Line 1188  sub get_instance { Line 1456  sub get_instance {
     '</td></tr>';      '</td></tr>';
  $result.='<tr><td colspan="4">';   $result.='<tr><td colspan="4">';
  my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();   my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
  my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';   my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
  foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {   foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
     my $file=$file_url.$partial_file;      my $file=$file_url.$partial_file;
       $file=~s|/+|/|g;
     &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);      &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
     $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.      $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.
  &Apache::loncommon::icon($file).'" border=0"> '.$file.   &Apache::loncommon::icon($file).'" border=0"> '.$file.
Removed from v.1.51  
changed lines
  Added in v.1.62

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.