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

Diff for /loncom/homework/bridgetask.pm between versions 1.19 and 1.20

version 1.19, 2005/05/09 21:55:01 version 1.20, 2005/05/10 16:03:44
Line 48  sub initialize_bridgetask { Line 48  sub initialize_bridgetask {
     $Apache::bridgetask::dimension='';      $Apache::bridgetask::dimension='';
     # list of all Dimension ids seen      # list of all Dimension ids seen
     @Apache::bridgetask::dimensionlist=();      @Apache::bridgetask::dimensionlist=();
       # mandatory attribute of all Dimensions seen
       %Apache::bridgetask::dimensionmandatory=();
     # list of all current Instance ids      # list of all current Instance ids
     @Apache::bridgetask::instance=();      @Apache::bridgetask::instance=();
     # list of all Instance ids seen in this problem      # list of all Instance ids seen in this problem
Line 180  sub start_Task { Line 182  sub start_Task {
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.=$head_tag_start.$body_tag_start.$form_tag_start;   $result.=$head_tag_start.$body_tag_start.$form_tag_start;
  $result.=   $result.='<input type="hidden" name="webgrade" value="yes" />';
     '<input type="hidden" name="grade_target" value="webgrade" />';  
  $result.=&show_queue();   $result.=&show_queue();
  my $todo=&get_from_queue();   my $todo=&get_from_queue();
  if ($todo) {   if ($todo) {
Line 231  sub end_Task { Line 232  sub end_Task {
  $result.=&Apache::lonxml::xmlend().'</html>';   $result.=&Apache::lonxml::xmlend().'</html>';
     }      }
  }   }
  if ($target eq 'grade') {   if ($target eq 'grade' && !$env{'form.webgrade'}) {
     my $award='SUBMITTED';      my $award='SUBMITTED';
     &Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award);      &Apache::essayresponse::file_submission('0','bridgetask',
       'portfiles',\$award);
     if ($award eq 'SUBMITTED' &&      if ($award eq 'SUBMITTED' &&
  $Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {   $Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
  $Apache::lonhomework::results{"resource.0.tries"}=   $Apache::lonhomework::results{"resource.0.tries"}=
Line 246  sub end_Task { Line 248  sub end_Task {
  &add_to_queue();   &add_to_queue();
     }      }
  }   }
    if ($target eq 'grade' && $env{'form.webgrade'}) {
       my $optional_required=
    &Apache::lonxml::get_param('OptionalRequired',$parstack,
      $safeeval);
       my $optional_passed=0;
       my $mandatory_failed=0;
       my $ungraded=0;
       my $review=0;   
       foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
    my $status=
       $Apache::lonhomeork::results{"resource.$dim_id.status"};
    my $mandatory=
       ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
    if ($status eq 'pass') {
       if (!$mandatory) { $optional_passed++; }
    } elsif ($status eq 'fail') {
       if ($mandatory) { $mandatory_failed++; }
    } elsif ($status eq 'ungraded') {
       $ungraded++;
    } elsif ($status eq 'review') {
       $review++;
    }
       }
       if ($optional_passed < $optional_required) {
    $mandatory_failed++;
       }
       $Apache::lonhomeork::results{'resource.grader'}=
    $env{'user.name'}.'@'.$env{'user.domain'};
       if ($review) {
    $Apache::lonhomeork::results{'resource.status'}='review';
    &move_to_review_queue();
       } elsif ($ungraded) {
    $Apache::lonhomeork::results{'resource.status'}='ungraded';
    &check_queue_unlock();
       } elsif ($mandatory_failed) {
    $Apache::lonhomeork::results{'resource.status'}='fail';
    $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';
    &remove_from_queue();
       } else {
    $Apache::lonhomeork::results{'resource.status'}='pass';
    $Apache::lonhomework::results{"resource.0.award"}='INCORRECT';
    &remove_from_queue();
       }
    }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="</table>\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 &amp; Next').'" /> ';
  $result.='<input type="submit" name="end" value="'.   #$result.='<input type="submit" name="end" value="'.
     &mt('Save & Stop Grading').'" /> ';   #    &mt('Save &amp; Stop Grading').'" /> ';
  $result.='<input type="submit" name="end" value="'.   #$result.='<input type="submit" name="throwaway" value="'.
     &mt('Throw Away & Stop Grading').'" /> ';   #    &mt('Throw Away &amp; Stop Grading').'" /> ';
    #$result.='<input type="submit" name="save" value="'.
    #    &mt('Save Partial Grade and Continue Grading').'" /> ';
  $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';   $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.='<parameter part="0" package="Task"></parameter>'."\n";   $result.='<parameter part="0" package="Task"></parameter>'."\n";
Line 290  sub show_queue { Line 338  sub show_queue {
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
     $result.="\n<h3>Current Queue</h3><table><tr><th>resource</th><th>user</th><th>type</th><th>data</th></tr>";      $result.="\n<h3>Current Queue</h3><table><tr><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))) {
  if ($key=~/locked$/) {   if ($key=~/locked$/) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);      my ($symb,$uname,$udom) = &decode_queue_key($key);
Line 309  sub show_queue { Line 358  sub show_queue {
     $result.="<tr><td>$title</td><td>$uname</td><td>";      $result.="<tr><td>$title</td><td>$uname</td><td>";
     my $slot=$queue{$key}->[0];      my $slot=$queue{$key}->[0];
     my %slot_data=&Apache::lonnet::get_slot($slot);      my %slot_data=&Apache::lonnet::get_slot($slot);
     $result.='<td>queue entry</td><td>End time: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";      $result.='<td>queue entry</td><td>End time: '.
    &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
    "</td></tr>";
  }   }
     }      }
     $result.="</table><hr />\n";      $result.="</table><hr />\n";
Line 484  sub start_Dimension { Line 535  sub start_Dimension {
     $Apache::bridgetask::dimension=$dim_id;      $Apache::bridgetask::dimension=$dim_id;
     push(@Apache::bridgetask::dimensionlist,$dim_id);      push(@Apache::bridgetask::dimensionlist,$dim_id);
     undef(@Apache::bridgetask::instance);      undef(@Apache::bridgetask::instance);
       $Apache::bridgetask::dimensionmandatory{$dim_id}=
    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     return '';      return '';
 }  }
   
Line 507  sub get_instance { Line 560  sub get_instance {
  } elsif ($target eq 'webgrade') {   } elsif ($target eq 'webgrade') {
     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::lonhomeork::history{'resource.'.$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 514  sub get_instance { Line 568  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.'"></textarea>'.      '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomeork::history{'resource.'.$instance.'.'.$id.'.comment'}).'</textarea>'.
     '</td>'.      '</td>'.
     '<td>'.      '<td>'.
     '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" />Ungraded</label></nobr><br />'.      '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'.
     '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" />Pass</label><br />'.      '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />Pass</label><br />'.
     '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" />Fail</label><br />'.      '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />Fail</label><br />'.
     '<label><input type="radio" name="HWVAL_'.$link.'" value="review" />Review</label><br />'.      '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />Review</label><br />'.
     '</td>'.      '</td>'.
     '<td>'.      '<td>'.
     '<a href="#'.$last_link.'">Prev</a><br />'.      '<a href="#'.$last_link.'">Prev</a><br />'.
     '<a href="#next_'.$link.'">Next</a><br />'.      '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
       '<input type="submit" name="next" value="'.
       &mt('Done').'" /> '.
     '</td></tr>';      '</td></tr>';
  $last_link=$link;   $last_link=$link;
     }      }
  } elsif ($target eq 'grade') {   } elsif ($target eq 'grade') {
     my $optional_passed=0;      my $optional_passed=0;
       my $mandatory_failed=0;
       my $ungraded=0;
       my $review=0;
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  if ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'pass') {   my $status=$Apache::lonhomeork::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
  } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'fail') {   $Apache::lonhomeork::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_'.$instance.'_'.$id};
  } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'ungraded') {   my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
  } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'review') {   if ($status eq 'pass') {
       if (!$mandatory) { $optional_passed++; }
    } elsif ($status eq 'fail') {
       if ($mandatory) { $mandatory_failed++; }
    } elsif ($status eq 'ungraded') {
       $ungraded++;
    } elsif ($status eq 'review') {
       $review++;
  }   }
     }      }
       if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
    $mandatory_failed++;
       }
       if ($review) {
    $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='review';
       } elsif ($ungraded) {
    $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='ungraded';
       } elsif ($mandatory_failed) {
    $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='fail';
       } else {
    $Apache::lonhomeork::results{'resource.'.$instance.'.status'}='pass';
       }
  }   }
  return $result;   return $result;
     }      }
Line 570  sub start_Instance { Line 648  sub start_Instance {
     push(@{$dimension{'instances'}},$id);      push(@{$dimension{'instances'}},$id);
     push(@Apache::bridgetask::instance,$id);      push(@Apache::bridgetask::instance,$id);
     push(@Apache::bridgetask::instancelist,$id);      push(@Apache::bridgetask::instancelist,$id);
     $dimension{$instance_id.'.optionalrequired'}=      $dimension{$id.'.optionalrequired'}=
  &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);   &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
     return '';      return '';
 }  }
Removed from v.1.19  
changed lines
  Added in v.1.20

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