Diff for /loncom/homework/bridgetask.pm between versions 1.17 and 1.18

version 1.17, 2005/05/03 14:52:31 version 1.18, 2005/05/06 20:26:35
Line 194  sub start_Task { Line 194  sub start_Task {
     $Apache::bridgetask::queue_key=$todo;      $Apache::bridgetask::queue_key=$todo;
     &Apache::structuretags::initialize_storage();      &Apache::structuretags::initialize_storage();
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);      &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       $result.="\n".'<table width="100%" style="width:100%" border="1">';
  } else {   } else {
     $result.="\n".      $result.="\n".
  '<table><tr><td>No user to be graded.</td></tr></table>';   '<table><tr><td>No user to be graded.</td></tr></table>';
Line 246  sub end_Task { Line 247  sub end_Task {
     }      }
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="\n<hr />";   $result.="</table>\n<hr />";
  $result.='<input type="submit" name="next" value="'.   $result.='<input type="submit" name="next" value="'.
     &mt('Save & Next').'" /> ';      &mt('Save & Next').'" /> ';
  $result.='<input type="submit" name="end" value="'.   $result.='<input type="submit" name="end" value="'.
Line 488  sub get_instance { Line 489  sub get_instance {
     return $order[0];      return $order[0];
 }  }
   
 sub end_Dimension {  {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my $last_link;
     my $result;      sub end_Dimension {
     if ($target eq 'web') {   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
  my $instance=&get_instance();   my $result;
  $result=$dimension{'intro'}.$dimension{$instance.'.text'};   if ($target eq 'web') {
     } elsif ($target eq 'webgrade') {      my $instance=&get_instance();
  my $instance=&get_instance();      $result=$dimension{'intro'}.$dimension{$instance.'.text'};
  $result.="\n".'<table>';   } elsif ($target eq 'webgrade') {
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {      my $instance=&get_instance();
     $result.='<tr><td>'.      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  $dimension{$instance.'.criteria.'.$id}.'</td></tr>';   my $link='criteria_'.$instance.'_'.$id;
    $result.='<tr><td valign="top">'.
       '<a name="'.$link.'" />'.
       '<a name="next_'.$last_link.'" />'.
       '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.
       #$dimension{$instance.'.criteria.'.$id}.
       '</td>'.
       '<td>Additional Comment for Student <br />'.
       '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'"></textarea>'.
       '</td>'.
       '<td>'.
       '<label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" />Ungraded</label><br />'.
       '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" />Pass</label><br />'.
       '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" />Fail</label><br />'.
       '<label><input type="radio" name="HWVAL_'.$link.'" value="review" />Review</label><br />'.
       '</td>'.
       '<td>'.
       '<a href="#'.$last_link.'">Prev</a><br />'.
       '<a href="#next_'.$link.'">Next</a><br />'.
       '</td></tr>';
    $last_link=$link;
       }
  }   }
  $result.='</table>';   return $result;
     }      }
     return $result;  
 }  }
   
 sub start_IntroParagraph {  sub start_IntroParagraph {

Removed from v.1.17  
changed lines
  Added in v.1.18


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