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

Diff for /loncom/homework/bridgetask.pm between versions 1.24 and 1.25

version 1.24, 2005/05/13 15:34:50 version 1.25, 2005/05/19 21:22:44
Line 83  sub proctor_check_auth { Line 83  sub proctor_check_auth {
     return 0;      return 0;
 }  }
   
   sub get_version {
       if ($env{'form.previousversion'} && 
    defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
    return $env{'form.previousversion'};
       }
       return $Apache::lonhomework::history{'resource.version'};
   }
   
 sub add_previous_version_button {  sub add_previous_version_button {
       my ($status)=@_;
     my $result;      my $result;
       if ($Apache::lonhomework::history{'resource.version'} eq '0') {
    return '';
       }
       my $version=&get_version();
       if ($version ne $Apache::lonhomework::history{'resource.version'}) {
    return '';
       }
   
     $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">      $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
 <option>Pick one</option>  <option>Pick one</option>
 </select>');  </select>');
Line 100  sub add_grading_button { Line 117  sub add_grading_button {
 }  }
   
 sub add_request_another_attempt_button {  sub add_request_another_attempt_button {
           my $result;
       $result.=' <input type="submit" name="requestattempt" value="'.
    &mt("Request another attempt").'" />';
       return $result;
 }  }
   
 sub start_Task {  sub start_Task {
Line 118  sub start_Task { Line 138  sub start_Task {
  &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);   &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
           
     if ($target eq 'web') {      if ($target eq 'web') {
  $body_tag_start.=&add_previous_version_button();  
  if ($Apache::lonhomework::modifygrades) {   if ($Apache::lonhomework::modifygrades) {
     $body_tag_start.='<form name="gradesubmission" method="POST" action="';      $body_tag_start.='<form name="gradesubmission" method="POST" action="';
     my $uri=$env{'request.uri'};      my $uri=$env{'request.uri'};
Line 128  sub start_Task { Line 147  sub start_Task {
     }      }
     if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||      if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  my $version=$Apache::lonhomework::history{'resource.version'};   my $version=&get_version();
  ($status,$accessmsg,my $slot_name,$slot) =    ($status,$accessmsg,my $slot_name,$slot) = 
     &Apache::lonhomework::check_task_access('0');      &Apache::lonhomework::check_task_access('0');
  push(@Apache::inputtags::status,$status);   push(@Apache::inputtags::status,$status);
Line 137  sub start_Task { Line 156  sub start_Task {
  $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';   $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.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);
  if (( $status eq 'CLOSED' ) ||   if (( $status eq 'CLOSED' ) ||
     ( $status eq 'BANNED') ||      ( $status eq 'BANNED') ||
     ( $status eq 'UNAVAILABLE') ||      ( $status eq 'UNAVAILABLE') ||
Line 195  sub start_Task { Line 215  sub start_Task {
  '" value="'.$env{"form.grade_$field"}.'" />'."\n";   '" value="'.$env{"form.grade_$field"}.'" />'."\n";
  }   }
     }      }
     if ($Apache::lonhomework::history{'resource.status'} eq 'fail') {      my $version=&get_version();
       if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
  $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';   $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
  $result.=&request_another_attempt_button();   $result.=&add_request_another_attempt_button();
     }      }
     if ($Apache::lonhomework::history{'resource.status'} eq 'pass') {      if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
  $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';   $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
     }      }
  }   }
Line 240  sub end_Task { Line 261  sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';      my $result='';
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
     my $version=$Apache::lonhomework::history{'resource.version'};      my $version=&get_version();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  if (   if (
Line 288  sub end_Task { Line 309  sub end_Task {
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     foreach my $dim_id (@Apache::bridgetask::dimensionlist) {      foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
  my $status=   my $status=
     $Apache::lonhomework::results{"resource.$dim_id.status"};      $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
  my $mandatory=   my $mandatory=
     ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');      ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
  if ($status eq 'pass') {   if ($status eq 'pass') {
Line 308  sub end_Task { Line 329  sub end_Task {
     $Apache::lonhomework::results{'resource.grader'}=      $Apache::lonhomework::results{'resource.grader'}=
  $env{'user.name'}.'@'.$env{'user.domain'};   $env{'user.name'}.'@'.$env{'user.domain'};
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{'resource.status'}='review';   $Apache::lonhomework::results{"resource.$version.status"}='review';
  &move_to_review_queue();   &move_to_review_queue();
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{'resource.status'}='ungraded';   $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
  &check_queue_unlock();   &check_queue_unlock();
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{'resource.status'}='fail';   $Apache::lonhomework::results{"resource.$version.status"}='fail';
  $Apache::lonhomework::results{"resource.$version.award"}='EXACT_ANS';   $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
    $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
    $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
  &remove_from_queue();   &remove_from_queue();
     } else {      } else {
  $Apache::lonhomework::results{'resource.status'}='pass';   $Apache::lonhomework::results{"resource.$version.status"}='pass';
  $Apache::lonhomework::results{"resource.$version.award"}='INCORRECT';   $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
    $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
    $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
  &remove_from_queue();   &remove_from_queue();
     }      }
       $Apache::lonhomework::results{'resource.status'}=
    $Apache::lonhomework::results{'resource.$version.status'};
       if (defined($Apache::lonhomework::results{'resource.$version.awarded'})) {
    $Apache::lonhomework::results{'resource.0.award'}=
       $Apache::lonhomework::results{'resource.$version.award'};
    $Apache::lonhomework::results{'resource.0.awarded'}=
       $Apache::lonhomework::results{'resource.$version.awarded'};
    $Apache::lonhomework::results{'resource.0.solved'}=
       $Apache::lonhomework::results{'resource.$version.solved'};
       }
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
Line 598  sub get_instance { Line 633  sub get_instance {
     sub end_Dimension {      sub end_Dimension {
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
  my $result;   my $result;
  my $dim_id=&get_id($parstack,$safeeval);   my $dim=&get_id($parstack,$safeeval);
  my $instance=&get_instance();   my $instance=&get_instance();
    my $version=&get_version();
  if ($target eq 'web') {   if ($target eq 'web') {
     $result=$dimension{'intro'}.$dimension{$instance.'.text'};      $result=$dimension{'intro'}.$dimension{$instance.'.text'};
     if ($Apache::lonhomework::history{'resource.status'} eq 'pass' ||      if ($Apache::lonhomework::history{'resource.$version.status'} eq 'pass' ||
  $Apache::lonhomework::history{'resource.status'} eq 'fail') {   $Apache::lonhomework::history{'resource.$version.status'} eq 'fail') {
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {   foreach my $id (@{$dimension{$instance.'.criterias'}}) {
     my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"};      my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
     my $comment=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"};      my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
     $result.='<table border="1"><tr><td>';      $result.='<table border="1"><tr><td>';
     if ($status eq 'fail') {      if ($status eq 'fail') {
  $result.='<font color="red">'.&mt('Did not pass').'</font>';   $result.='<font color="red">'.&mt('Did not pass').'</font>';
Line 616  sub get_instance { Line 652  sub get_instance {
  &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");   &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
     }      }
     $result.='</td></tr><tr><td>';      $result.='</td></tr><tr><td>';
     if ($Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}) {      if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
  $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}.'</td></tr><tr><td>';   $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
     }      }
     $result.=$dimension{$instance.'.criteria.'.$id}.      $result.=$dimension{$instance.'.criteria.'.$id}.
  '</td></tr></table>';   '</td></tr></table>';
  }   }
     }      }
  } elsif ($target eq 'webgrade') {   } elsif ($target eq 'webgrade') {
     my $version=$Apache::lonhomework::history{'resource.version'};  
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  my $link='criteria_'.$instance.'_'.$id;   my $link='criteria_'.$instance.'_'.$id;
  my $status=$Apache::lonhomework::history{"resource.$dim_id.$instance.$id.status"};   my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
  $result.='<tr><td width="100%" valign="top">'.   $result.='<tr><td width="100%" valign="top">'.
     '<a name="'.$link.'" />'.      '<a name="'.$link.'" />'.
     '<a name="next_'.$last_link.'" />'.      '<a name="next_'.$last_link.'" />'.
Line 635  sub get_instance { Line 670  sub get_instance {
     #$dimension{$instance.'.criteria.'.$id}.      #$dimension{$instance.'.criteria.'.$id}.
     '</td>'.      '</td>'.
     '<td><nobr>Additional Comment for Student</nobr> <br />'.      '<td><nobr>Additional Comment for Student</nobr> <br />'.
     '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$dim_id.$instance.$id.comment"}).'</textarea>'.      '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
     '</td>'.      '</td>'.
     '<td>'.      '<td>'.
     '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'.      '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'.
Line 668  sub get_instance { Line 703  sub get_instance {
     my $ungraded=0;      my $ungraded=0;
     my $review=0;      my $review=0;
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  my $status=$Apache::lonhomework::results{"resource.$dim_id.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};   my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
  $Apache::lonhomework::results{"resource.$dim_id.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};   $Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
  my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');   my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
  if ($status eq 'pass') {   if ($status eq 'pass') {
     if (!$mandatory) { $optional_passed++; }      if (!$mandatory) { $optional_passed++; }
Line 688  sub get_instance { Line 723  sub get_instance {
     }      }
     &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");      &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{"resource.$dim_id.status"}=   $Apache::lonhomework::results{"resource.$version.$dim.status"}=
     'review';      'review';
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$dim_id.status"}=   $Apache::lonhomework::results{"resource.$version.$dim.status"}=
     'ungraded';      'ungraded';
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{"resource.$dim_id.status"}=   $Apache::lonhomework::results{"resource.$version.$dim.status"}=
     'fail';      'fail';
     } else {      } else {
  $Apache::lonhomework::results{"resource.$dim_id.status"}=   $Apache::lonhomework::results{"resource.$version.$dim.status"}=
     'pass';      'pass';
     }      }
  }   }
Removed from v.1.24  
changed lines
  Added in v.1.25

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