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

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

version 1.15, 2005/05/03 05:31:51 version 1.25, 2005/05/19 21:22: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 57  sub initialize_bridgetask { Line 59  sub initialize_bridgetask {
 }  }
   
 sub proctor_check_auth {  sub proctor_check_auth {
     my ($slot)=@_;      my ($slot_name,$slot)=@_;
     my $user=$env{'form.proctorname'};      my $user=$env{'form.proctorname'};
     my $domain=$env{'form.proctordomain'};      my $domain=$env{'form.proctordomain'};
           
Line 67  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.$version.checkedin.slot"}=
       $slot_name;
  return 1;   return 1;
     }      }
  }   }
Line 76  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 92  sub add_grading_button { Line 116  sub add_grading_button {
     return $result;      return $result;
 }  }
   
   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 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     &Apache::structuretags::initialize_storage();  
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);  
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
       if ($target ne 'webgrade') {
    &Apache::structuretags::initialize_storage();
    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       } 
   
     $Apache::lonhomework::parsing_a_task=1;      $Apache::lonhomework::parsing_a_task=1;
     #should get back a <html> or the neccesary stuff to start XML/MathML      #should get back a <html> or the neccesary stuff to start XML/MathML
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=      my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
  &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 112  sub start_Task { Line 145  sub start_Task {
     $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";      $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
  }   }
     }      }
     if ($target eq 'web' || $target eq 'grade' || $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') ||
     ( $status eq 'NOT_IN_A_SLOT') ||      ( $status eq 'NOT_IN_A_SLOT') ||
     ( $status eq 'NEEDS_CHECKIN') ||      ( $status eq 'NEEDS_CHECKIN') ||
       ( $status eq 'WAITING_FOR_GRADE') ||
     ( $status eq 'INVALID_ACCESS')) {      ( $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" ) {
Line 139  sub start_Task { Line 175  sub start_Task {
  } elsif ($status eq 'NEEDS_CHECKIN') {   } elsif ($status eq 'NEEDS_CHECKIN') {
     $msg.='<h1>'.&mt('You need the Proctor to validate you.').      $msg.='<h1>'.&mt('You need the Proctor to validate you.').
  '</h1>'.&proctor_validation_screen($slot);   '</h1>'.&proctor_validation_screen($slot);
    } elsif ($status eq 'WAITING_FOR_GRADE') {
       $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
  } elsif ($status ne 'NOT_YET_VIEWED') {   } elsif ($status ne 'NOT_YET_VIEWED') {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }
Line 153  sub start_Task { Line 191  sub start_Task {
  } else {   } else {
     $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";      $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
  }   }
     } elsif ($target eq 'grade') {      } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
  if ($status eq 'NEEDS_CHECKIN') {   if ($status eq 'NEEDS_CHECKIN') {
     if (&proctor_check_auth($slot)) {      if (&proctor_check_auth($slot_name,$slot)) {
  #FIXME immeadiatly add this to the grading queue   #FIXME immeadiatly add this to the grading queue
                         #      with slot->{'endtime'} for when grading can                           #      with slot->{'endtime'} for when grading can 
                         #      begin on this resource                          #      begin on this resource
    # FIXME I think the above is done by default,
                           #        need to check that
                           #        failure doesn't do this.
      }       }
  }   }
     }      }
Line 174  sub start_Task { Line 215  sub start_Task {
  '" value="'.$env{"form.grade_$field"}.'" />'."\n";   '" value="'.$env{"form.grade_$field"}.'" />'."\n";
  }   }
     }      }
       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.=&add_request_another_attempt_button();
       }
       if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
    $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
       }
    }
       } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
         $target eq 'webgrade') {
    if ($target eq 'webgrade') {
       $result.=$head_tag_start.$body_tag_start.$form_tag_start;
       $result.='<input type="hidden" name="webgrade" value="yes" />';
       $result.=&show_queue();
  }   }
     } elsif ($target eq 'webgrade') {  
  $result.=$head_tag_start.$body_tag_start.$form_tag_start;  
  $result.=&show_queue();  
  my $todo=&get_from_queue();   my $todo=&get_from_queue();
  if ($todo) {   if ($todo) {
       &setup_env_for_other_user($todo,$safeeval);
     my ($symb,$uname,$udom)=&decode_queue_key($todo);      my ($symb,$uname,$udom)=&decode_queue_key($todo);
     $result.="\n".'<table><tr><td>Found'.      $result.="\n".'<table><tr><td>Found '.
  $symb.':'.$uname.':'.$udom.'</td></tr></table>';   &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
     $result.='<input type="hidden" name="gradingkey" value="'.      $result.='<input type="hidden" name="gradingkey" value="'.
  &HTML::Entites::encode($todo).'" />';   &Apache::lonnet::escape($todo).'" />';
     $Apache::bridgetask::queue_key=$todo;      $Apache::bridgetask::queue_key=$todo;
       &Apache::structuretags::initialize_storage();
       &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       $result.="\n".'<table width="100%" style="width:100%" border="1">';
  } else {   } else {
     $result.="\n".      if ($target eq 'webgrade') {
  '<table><tr><td>No user to be graded.</td></tr></table>';   $result.="\n".
       '<table><tr><td>No user to be graded.</td></tr></table>';
       }
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
  }   }
   
     } 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
  $result = '';   $result = '';
Line 203  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 212  sub end_Task { Line 271  sub end_Task {
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($status eq 'CAN_ANSWER') {   if ($status eq 'CAN_ANSWER') {
     $result.="\n".'<table border="1">'.      $result.="\n".'<table border="1">'.
  &Apache::inputtags::file_selector('0',"bridgetask","*",   &Apache::inputtags::file_selector($version,
     "bridgetask","*",
   'portfolioonly').    'portfolioonly').
   "</table>";    "</table>";
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
Line 222  sub end_Task { Line 282  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.$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') {
  &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;   
       &Apache::lonhomework::showhash(%Apache::lonhomework::results);
       foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
    my $status=
       $Apache::lonhomework::results{"resource.$version.$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::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
       $Apache::lonhomework::results{'resource.grader'}=
    $env{'user.name'}.'@'.$env{'user.domain'};
       if ($review) {
    $Apache::lonhomework::results{"resource.$version.status"}='review';
    &move_to_review_queue();
       } elsif ($ungraded) {
    $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
    &check_queue_unlock();
       } elsif ($mandatory_failed) {
    $Apache::lonhomework::results{"resource.$version.status"}='fail';
    $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();
       } else {
    $Apache::lonhomework::results{"resource.$version.status"}='pass';
    $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();
       }
       $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();
    }
     } 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 &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 255  sub end_Task { Line 379  sub end_Task {
     return $result;      return $result;
 }  }
   
   sub move_to_review_queue {
       &Apache::lonxml::debug("Want to move");
   }
   
   sub check_queue_unlock {
       &Apache::lonxml::debug("Want to unlock?");
   }
   
   sub remove_from_queue {
       &Apache::lonxml::debug("Want to remove. Done?");
   }
   
   sub setup_env_for_other_user {
       my ($queue_key,$safeeval)=@_;
       my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
       $env{'form.grade_symb'}=$symb;
       $env{'form.grade_domain'}=$udom;
       $env{'form.grade_username'}=$uname;
       $env{'form.grade_courseid'}=$env{'request.course.id'};
       &Apache::lonxml::initialize_rndseed($safeeval);
   }
   
 sub add_to_queue {  sub add_to_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 %data;      my %data;
     #$data{"$symb\0timestamp"}=time;  
     $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name];      $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name];
     &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum);      &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum);
 }  }
Line 270  sub show_queue { Line 415  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 $regexp="^$symb\0queue";      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>Time available for grading</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))) {
  my ($symb,undef,$user) = split("\0",$key);   if ($key=~/locked$/) {
  my ($uname,$udom) = split('@',$user);      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><td>";
  my $slot=$queue{$key}->[0];      $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
  my %slot_data=&Apache::lonnet::get_slot($slot);   } elsif ($key=~/timestamp$/) {
  $result.="End time: ".&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";      my ($symb,undef) = split("\0",$key);
       my $title=&Apache::lonnet::gettitle($symb);
       $result.="<tr><td>$title</td><td></td><td>";
       $result.='<td>last queue modification time</td><td>'.
    &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
    } else {
       my ($symb,$uname,$udom) = &decode_queue_key($key);
       my $title=&Apache::lonnet::gettitle($symb);
       $result.="<tr><td>$title</td><td>$uname</td><td>";
       my $slot=$queue{$key}->[0];
       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.="</table><hr />\n";      $result.="</table><hr />\n";
     return $result;      return $result;
Line 305  sub queue_key_locked { Line 465  sub queue_key_locked {
   
 sub pick_from_queue_data {  sub pick_from_queue_data {
     my ($check_section,$queue,$cdom,$cnum)=@_;      my ($check_section,$queue,$cdom,$cnum)=@_;
     foreach my $key (sort(keys(%$queue))) {      foreach my $key (keys(%$queue)) {
  my ($symb,$uname,$udom)=&decode_queue_key($key);   my ($symb,$uname,$udom)=&decode_queue_key($key);
  if ($check_section) {   if ($check_section) {
     my $section=&Apache::lonnet::getsection($uname,$udom);      my $section=&Apache::lonnet::getsection($uname,$udom);
     if ($section ne $check_section) {      if ($section eq $check_section) {
  &Apache::lonnet::logthis("not my sec");   &Apache::lonnet::logthis("my sec");
  next;   next;
     }      }
  }   }
Line 331  sub pick_from_queue_data { Line 491  sub pick_from_queue_data {
   
 sub find_mid_grade {  sub find_mid_grade {
     my ($symb,$cdom,$cnum)=@_;      my ($symb,$cdom,$cnum)=@_;
     my $todo=$env{'form.gradingkey'};      my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.'@'.$env{'user.domain'};
     if ($todo) {      if ($todo) {
  my $who=&queue_key_locked($todo,$cdom,$cnum);   my $who=&queue_key_locked($todo,$cdom,$cnum);
Line 359  sub get_from_queue { Line 519  sub get_from_queue {
     # FIXME need to find if I am 'mid grading'      # FIXME need to find if I am 'mid grading'
     $todo=&find_mid_grade($symb,$cdom,$cnum);      $todo=&find_mid_grade($symb,$cdom,$cnum);
     &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));      &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));
       if ($todo) { return $todo; }
     while (1) {      while (1) {
  my $starttime=time;   my $starttime=time;
  &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},   &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},
Line 438  sub end_ClosingParagraph { Line 599  sub end_ClosingParagraph {
     return $result;      return $result;
 }  }
   
   sub get_id {
       my ($parstack,$safeeval)=@_;
       my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
       if (!$id) { $id=$Apache::lonxml::curdepth; }
       return $id;
   }
   
 my %dimension;  my %dimension;
 sub start_Dimension {  sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     undef(%dimension);      undef(%dimension);
     my $dim_id=$Apache::lonxml::curdepth;      my $dim_id=&get_id($parstack,$safeeval);
     $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 458  sub get_instance { Line 628  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'};   my $dim=&get_id($parstack,$safeeval);
     } elsif ($target eq 'webgrade') {  
  my $instance=&get_instance();   my $instance=&get_instance();
  $result.="\n".'<table>';   my $version=&get_version();
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {   if ($target eq 'web') {
     $result.='<tr><td>'.      $result=$dimension{'intro'}.$dimension{$instance.'.text'};
  $dimension{$instance.'.criteria.'.$id}.'</td></tr>';      if ($Apache::lonhomework::history{'resource.$version.status'} eq 'pass' ||
    $Apache::lonhomework::history{'resource.$version.status'} eq 'fail') {
    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
       my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
       my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
       $result.='<table border="1"><tr><td>';
       if ($status eq 'fail') {
    $result.='<font color="red">'.&mt('Did not pass').'</font>';
       } elsif ($status eq 'pass') {
    $result.='<font color="green">'.&mt('Passed').'</font>';
       } else {
    &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
       }
       $result.='</td></tr><tr><td>';
       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.=$dimension{$instance.'.criteria.'.$id}.
    '</td></tr></table>';
    }
       }
    } elsif ($target eq 'webgrade') {
       foreach my $id (@{$dimension{$instance.'.criterias'}}) {
    my $link='criteria_'.$instance.'_'.$id;
    my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
    $result.='<tr><td width="100%" 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><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.$version.$dim.$instance.$id.comment"}).'</textarea>'.
       '</td>'.
       '<td>'.
       '<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" '.($status eq 'pass' ? 'checked="checked"':'').' />Pass</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" '.($status eq 'review' ? 'checked="checked"':'').' />Review</label><br />'.
       '</td>'.
       '<td>'.
       '<a href="#'.$last_link.'">Prev</a><br />'.
       '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
       '<input type="submit" name="next" value="'.
       &mt('Done').'" /> '.
       '</td></tr>';
    $result.='<tr><td colspan="4">';
    my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
    my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
    foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {
       my $file=$file_url.$partial_file;
       &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
       $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
    &Apache::loncommon::icon($file).'" border=0"> '.$file.
    '</a>';
    }
    $result.='</td></tr>';
    $last_link=$link;
       }
    } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
       my $optional_passed=0;
       my $mandatory_failed=0;
       my $ungraded=0;
       my $review=0;
       foreach my $id (@{$dimension{$instance.'.criterias'}}) {
    my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_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');
    if ($status eq 'pass') {
       if (!$mandatory) { $optional_passed++; }
    } elsif ($status eq 'fail') {
       if ($mandatory) { $mandatory_failed++; }
    } elsif ($status eq 'review') {
       $review++;
    } elsif ($status eq 'ungraded') {
       $ungraded++;
    } else {
       &Apache::lonxml::error("got weird status --$status--");
    }
       }
       if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
    $mandatory_failed++;
       }
       &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
       if ($review) {
    $Apache::lonhomework::results{"resource.$version.$dim.status"}=
       'review';
       } elsif ($ungraded) {
    $Apache::lonhomework::results{"resource.$version.$dim.status"}=
       'ungraded';
       } elsif ($mandatory_failed) {
    $Apache::lonhomework::results{"resource.$version.$dim.status"}=
       'fail';
       } else {
    $Apache::lonhomework::results{"resource.$version.$dim.status"}=
       'pass';
       }
  }   }
  $result.='</table>';   return $result;
     }      }
     return $result;  
 }  }
   
 sub start_IntroParagraph {  sub start_IntroParagraph {
Line 500  sub end_IntroParagraph { Line 764  sub end_IntroParagraph {
   
 sub start_Instance {  sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);      my $id=&get_id($parstack,$safeeval);
     push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);      push(@{$dimension{'instances'}},$id);
     push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);      push(@Apache::bridgetask::instance,$id);
       push(@Apache::bridgetask::instancelist,$id);
       $dimension{$id.'.optionalrequired'}=
    &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
     return '';      return '';
 }  }
   
Line 530  sub end_InstanceText { Line 797  sub end_InstanceText {
   
 sub start_Criteria {  sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
     }      }
     return '';      return '';
Line 539  sub start_Criteria { Line 806  sub start_Criteria {
 sub end_Criteria {  sub end_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];      my $instance_id=$Apache::bridgetask::instance[-1];
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
  my $criteria=&Apache::lonxml::endredirection();   my $criteria=&Apache::lonxml::endredirection();
  my $id=$Apache::lonxml::curdepth;   my $id=&get_id($parstack,$safeeval);
  $dimension{$instance_id.'.criteria.'.$id}=$criteria;   $dimension{$instance_id.'.criteria.'.$id}=$criteria;
    $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
       &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
  push(@{$dimension{$instance_id.'.criterias'}},$id);   push(@{$dimension{$instance_id.'.criterias'}},$id);
     }      }
     return '';      return '';
Removed from v.1.15  
changed lines
  Added in v.1.25

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