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

Diff for /loncom/homework/bridgetask.pm between versions 1.22 and 1.27

version 1.22, 2005/05/10 20:29:26 version 1.27, 2005/05/20 18:07:29
Line 69  sub proctor_check_auth { Line 69  sub proctor_check_auth {
  if ($puser eq $user && $pdom eq $domain) {   if ($puser eq $user && $pdom eq $domain) {
     my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);      my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
     if ($authhost ne 'no_host') {      if ($authhost ne 'no_host') {
  $Apache::lonhomework::results{'resource.checkedin'}=   my $version=
       $Apache::lonhomework::results{'resource.version'}=
       ++$Apache::lonhomework::history{'resource.version'};
    $Apache::lonhomework::results{"resource.$version.checkedin"}=
     $user.'@'.$domain;      $user.'@'.$domain;
  $Apache::lonhomework::results{'resource.checkedin.slot'}=   $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
     $slot_name;      $slot_name;
  return 1;   return 1;
     }      }
Line 80  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 97  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 115  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 125  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=&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);
  $Apache::inputtags::slot_name=$slot_name;   $Apache::inputtags::slot_name=$slot_name;
  my $expression='$external::datestatus="'.$status.'";';   my $expression='$external::datestatus="'.$status.'";';
  $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.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 191  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 236  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=&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 260  sub end_Task { Line 286  sub end_Task {
     &Apache::essayresponse::file_submission('0','bridgetask',      &Apache::essayresponse::file_submission('0','bridgetask',
     'portfiles',\$award);      'portfiles',\$award);
     if ($award eq 'SUBMITTED' &&      if ($award eq 'SUBMITTED' &&
  $Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {   $Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) {
  $Apache::lonhomework::results{"resource.0.tries"}=   $Apache::lonhomework::results{"resource.$version.tries"}=
     1+$Apache::lonhomework::history{"resource.0.tries"};      1+$Apache::lonhomework::history{"resource.$version.tries"};
     }      }
     $Apache::lonhomework::results{"resource.0.award"}=$award;      $Apache::lonhomework::results{"resource.$version.award"}=$award;
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
     if ($award eq 'SUBMITTED') {      if ($award eq 'SUBMITTED') {
Line 282  sub end_Task { Line 308  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 302  sub end_Task { Line 328  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.0.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.0.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 347  sub check_queue_unlock { Line 387  sub check_queue_unlock {
 }  }
   
 sub remove_from_queue {  sub remove_from_queue {
     &Apache::lonxml::debug("Want to remove. Done?");      my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
       my $cnum=$env{'course.'.$cid.'.num'};
       my $cdom=$env{'course.'.$cid.'.domain'};
       my $key="$symb\0queue\0$uname\@$udom";
       my @keys=($key,"$key\0locked");
       &Apache::lonnet::del('gradingqueue',\@keys,$cdom,$cnum);
 }  }
   
 sub setup_env_for_other_user {  sub setup_env_for_other_user {
Line 376  sub show_queue { Line 421  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>".      $result.="\n<h3>Current Queue</h3><table border='1'><tr><th>resource</th>".
  "<th>user</th><th>type</th><th>data</th></tr>";   "<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);
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="<tr><td>$title</td><td>$uname</td><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>';
  } elsif ($key=~/timestamp$/) {   } elsif ($key=~/timestamp$/) {
     my ($symb,undef) = split("\0",$key);      my ($symb,undef) = split("\0",$key);
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="<tr><td>$title</td><td></td><td>";      $result.="<tr><td>$title</td><td></td>";
     $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>";
  } else {   } else {
     my ($symb,$uname,$udom) = &decode_queue_key($key);      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><td>";      $result.="<tr><td>$title</td><td>$uname</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: '.      $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
  &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).   &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
  "</td></tr>";   "</td></tr>";
  }   }
Line 592  sub get_instance { Line 637  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 610  sub get_instance { Line 656  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>';
Line 620  sub get_instance { Line 666  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::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 628  sub get_instance { Line 674  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 645  sub get_instance { Line 691  sub get_instance {
  $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.0.bridgetask.portfiles"})) {   foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {
     my $file=$file_url.$partial_file;      my $file=$file_url.$partial_file;
     &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);      &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
     $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.      $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
Line 661  sub get_instance { Line 707  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 681  sub get_instance { Line 727  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.22  
changed lines
  Added in v.1.27

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