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

Diff for /loncom/homework/bridgetask.pm between versions 1.197 and 1.205

version 1.197, 2006/11/09 17:50:51 version 1.205, 2006/11/14 22:12:58
Line 234  sub add_grading_button { Line 234  sub add_grading_button {
     if (scalar(keys(%sections)) < 3) {      if (scalar(keys(%sections)) < 3) {
  $size=scalar(keys(%sections))+2;   $size=scalar(keys(%sections))+2;
     }      }
     my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";      my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
     $sec_select .= "<option value='all' selected='selected'>all</option>\n";      $sec_select .= "\t<option value='all' selected='selected'>all</option>\n";
     foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {      foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
  $sec_select .= "<option value=\"$sec\">$sec</option>\n";   $sec_select .= "\t<option value=\"$sec\">$sec</option>\n";
     }      }
     $sec_select .= "<option value='none'>none</option></select>\n";      $sec_select .= "\t<option value='none'>none</option>\n</select>\n";
           
     my $result=' <input type="submit" name="gradeasubmission" value="'.      my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.
  &mt("Get a submission to grade").'" />';   &mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';      $result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');   my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
  $result.='<table><tr>';   $result.="\n\t".'<table>'."\n\t\t".'<tr>';
  $result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';   $result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.
  $result.='<td>'.' <input type="submit" name="reviewagrading" value="'.      "\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';
    $result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.
     &mt("Select an entry from the grading queue:").'" /> ';      &mt("Select an entry from the grading queue:").'" /> ';
   
  $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";   $result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
   
  ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');   ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
  $result.='<tr><td>'.   $result.="\n\t\t".'<tr>'.
     ' <input type="submit" name="reviewasubmission" value="'.      "\n\t\t\t".'<td>'.
       "\n\t\t\t\t".'<input type="submit" name="reviewasubmission" value="'.
     &mt("Select an entry from the review queue:").'" /> ';      &mt("Select an entry from the review queue:").'" /> ';
  $result.=&mt("[_1] entries, [_2] ready, [_3] being graded",   $result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
      $entries,$ready,$locks).'</td></tr>'."\n";       $entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
  $result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.   $result.="\n\t\t".'<tr>'.
     &mt("List of user's grade status").'" /> </td></tr></table>'."\n";      "\n\t\t\t".'<td>'.
  $result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.      "\n\t\t\t\t".'<input type="submit" name="regradeasubmission" value="'.
     &mt("Regrade specific user:").'" />'."\n";      &mt("List of user's grade status").'" /> </td>'
  $result.='<input type="text" size="12" name="gradinguser" />';      ."\n\t\t".'</tr>'
       ."\n\t".'</table>'."\n";
    $result.="\n\t".'<p>'.
       "\n\t\t".'<input type="submit" name="regradeaspecificsubmission" value="'.
       &mt("Regrade specific user:").'" />';
    $result.= "\n\t\t".'<input type="text" size="12" name="gradinguser" />';
  $result.=&Apache::loncommon::select_dom_form($env{'user.domain'},   $result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
      'gradingdomain');       'gradingdomain');
  $result.=' '.   $result.=' '.
Line 271  sub add_grading_button { Line 278  sub add_grading_button {
    'gradinguser',     'gradinguser',
    'gradingdomain');     'gradingdomain');
  $result.=&Apache::loncommon::studentbrowser_javascript();   $result.=&Apache::loncommon::studentbrowser_javascript();
  $result.= '</p>';   $result.= '</p>'."\n";
     }      }
     return $result;      return $result;
 }  }
Line 295  sub add_request_another_attempt_button { Line 302  sub add_request_another_attempt_button {
  my $description=&Apache::slotrequest::get_description($slot_name,   my $description=&Apache::slotrequest::get_description($slot_name,
       $slot);        $slot);
  $result.=(<<STUFF);   $result.=(<<STUFF);
 <p> Will be next available: $description </p>      <p> Will be next available: $description </p>
 STUFF  STUFF
     }      }
           
     if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }      if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
     $symb=&escape($symb);      $symb=&escape($symb);
     $result.='<form method="post" action="/adm/slotrequest">'.      $result.=
  '<input type="hidden" name="symb" value="'.$symb.'" />'.          "\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t".
  '<input type="hidden" name="command" value="'.$action.'" />'.   '<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".
    '<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".
  '<input type="submit" name="requestattempt" value="'.   '<input type="submit" name="requestattempt" value="'.
  &mt($text).'" />'.   &mt($text).'" />'."\n\t".
  '</form>';   '</form>'."\n";
     return $result;      return $result;
 }  }
   
Line 584  sub start_Task { Line 592  sub start_Task {
     $result.='<form name="gradesubmission" method="post" action="';      $result.='<form name="gradesubmission" method="post" action="';
     my $uri=$env{'request.uri'};      my $uri=$env{'request.uri'};
     if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }      if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
     $result.=$uri.'">'.&add_grading_button()."</form>";      $result.=$uri.'">'.&add_grading_button()."</form>\n";
     my $symb=&Apache::lonnet::symbread();      my $symb=&Apache::lonnet::symbread();
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.   $result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
Line 683  sub start_Task { Line 691  sub start_Task {
   
     $result.=&preserve_grade_info();      $result.=&preserve_grade_info();
     $result.=&internal_location();       $result.=&internal_location(); 
     $result.=$form_tag_start.      $result.=$form_tag_start."\t".
  '<input type="hidden" name="submitted" value="yes" />';   '<input type="hidden" name="submitted" value="yes" />';
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
  }   }
Line 1009  sub end_Task { Line 1017  sub end_Task {
  if (!$previous && $status ne 'SHOW_ANSWER' &&   if (!$previous && $status ne 'SHOW_ANSWER' &&
     &show_task($status,$previous)) {      &show_task($status,$previous)) {
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
     $result.='</form>';   }
   
    $result.='</form>';
   
    if (!$previous && $status ne 'SHOW_ANSWER' &&
       &show_task($status,$previous)) {
     my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});      my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
     $result.=<<DONEBUTTON;      $result.=<<DONEBUTTON;
 <form name="done" method="post" action="$action">  <form name="done" method="post" action="$action">
Line 1037  DONEBUTTON Line 1050  DONEBUTTON
     }      }
     $start_time=&Apache::lonlocal::locallocaltime($start_time);      $start_time=&Apache::lonlocal::locallocaltime($start_time);
   
     my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";      my $status = 
    "\n<div class='LC_$bt_status LC_criteria'>\n\t";
           
     if ($bt_status eq 'pass')  {      if ($bt_status eq 'pass')  {
  $status.='<h2>You passed the '.$title.' given on '.   $status.='<h2>You passed the '.$title.' given on '.
Line 1050  DONEBUTTON Line 1064  DONEBUTTON
     $status.=&add_request_another_attempt_button();      $status.=&add_request_another_attempt_button();
  }   }
     }      }
     $status.='</div>';      $status.="\n".'</div>'."\n";
     my $dim = $top;      my $dim = $top;
     my %counts = &get_counts($dim,undef,$parstack,      my %counts = &get_counts($dim,undef,$parstack,
      $safeeval);       $safeeval);
     $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'><p>".      $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t<p>".
  &mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',   &question_status_message(\%counts,-1).
     $counts{'man'},$counts{'opt_req'},   "</p>\n</div>\n";
     $counts{'opt'},$counts{'opt_passed'}).  
     "</p></div>\n";  
           
   
     foreach my $id (@{$dimension{$dim}{'criterias'}}) {      foreach my $id (@{$dimension{$dim}{'criterias'}}) {
Line 2092  sub start_Dimension { Line 2104  sub start_Dimension {
     }      }
     push(@Apache::bridgetask::dimension,$dim);      push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
     &enable_dimension_parsing($dim);      if (!&skip_dimension_parsing($dim)) {
    &enable_dimension_parsing($dim);
       }
     return &internal_location($dim);      return &internal_location($dim);
 }  }
   
Line 2181  sub end_Dimension { Line 2195  sub end_Dimension {
     my $instance=&get_instance($dim);      my $instance=&get_instance($dim);
     my $version=&get_version();      my $version=&get_version();
     if ($target eq 'web') {      if ($target eq 'web') {
    $result .= "\n".'<div class="LC_question">'."\n";
  $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);   $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
  my @instances = $instance;   my @instances = $instance;
  if (&Apache::response::showallfoils()) {   if (&Apache::response::showallfoils()) {
Line 2212  sub end_Dimension { Line 2227  sub end_Dimension {
  if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {   if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
     $mandatory='Optional';      $mandatory='Optional';
  }   }
  my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";   my $dim_info=
       "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
  my $question = ('sub' x $dimension{$dim}{'depth'}).'question';   my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
  $question =~ s/^(.)/uc($1)/e;   $question =~ s/^(.)/uc($1)/e;
  if ($dim_status eq 'pass') {   if ($dim_status eq 'pass') {
     $dim_info.='<h3>'.$question.' : you passed this '.$mandatory.' question</h3>';      $dim_info.='<h3>'.$question.' : you passed the above '.$mandatory.' question</h3>';
  }   }
  if ($dim_status eq 'fail') {   if ($dim_status eq 'fail') {
     $dim_info.='<h3>'.$question.' : you did not pass this '.$mandatory.' question</h3>';      $dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>';
  }   }
  my %counts = &get_counts($dim,$instance,$parstack,   my %counts = &get_counts($dim,$instance,$parstack,
  $safeeval);   $safeeval);
   
  $dim_info.="\n<p>"   $dim_info.="\n\t<p>"
     .&question_status_message(\%counts,      .&question_status_message(\%counts,
       $dimension{$dim}{'depth'})        $dimension{$dim}{'depth'})
     ."</p>\n</div>";      ."</p>\n</div>\n";
   
  foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},   foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
  @{$dimension{$dim}{'criterias'}}) {   @{$dimension{$dim}{'criterias'}}) {
     my $type = $dimension{$dim}{'criteria.'.$id.'.type'};      my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
     if ($type eq 'dimension') {      if ($type eq 'dimension') {
  $result.=$dimension{$id}{'result'};   if (defined($dimension{$id}{'result'})) {
  next;      $result.=$dimension{$id}{'result'};
       next;
    } else {
       $dim_info .=
    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
         [@_],{'set_dim_id' => $id});
    }
       } else {
    my $criteria =
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},
     [@_]);
    $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
     }      }
     my $criteria =   
  &nested_parse(\$dimension{$dim}{'criteria.'.$id},  
       [@_]);  
     $dim_info .= &layout_web_Criteria($dim,$id,$criteria);  
  }   }
    # puts the results at the end of the dimension
    $result .= $dim_info;
   
  my $internal_location=&internal_location($dim);   # puts the results at the beginning of the dimension
  $result=~s/\Q$internal_location\E/$dim_info/;   # my $internal_location=&internal_location($dim);
    # $result=~s/\Q$internal_location\E/$dim_info/;
     }      }
  }   }
    $result .= "\n</div>\n";
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  # in case of any side effects that we need   # in case of any side effects that we need
  &nested_parse(\$dimension{$dim}{'intro'},[@_]);   &nested_parse(\$dimension{$dim}{'intro'},[@_]);
Line 2351  sub end_Dimension { Line 2378  sub end_Dimension {
     return $result;      return $result;
 }  }
   
 sub status_message {  sub question_status_message {
     my ($counts,$depth) = @_;      my ($counts,$depth) = @_;
     my %req  = ('man' => 'mandatory',      my %req  = ('man' => 'mandatory',
  'opt' => 'optional',);   'opt' => 'optional',);
Line 2501  sub grading_history { Line 2528  sub grading_history {
     $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';      $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
  }   }
  if ($entry) {   if ($entry) {
     $result.= "<li>$grader : $entry </li>";      $result.= "\n\t\t<li>\n\t\t\t$grader :\n\t\t\t $entry \n\t\t</li>";
  }   }
     }      }
     if ($result) {      if ($result) {
  return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';   return "\n\t".'<ul class="LC_GRADING_pastgrading">'.$result.
       "\n\t".'</ul>'."\n";
     }      }
     return '';      return '';
 }  }
Line 2618  sub layout_web_Criteria { Line 2646  sub layout_web_Criteria {
     my $status_display=$status;      my $status_display=$status;
     $status_display=~s/^([a-z])/uc($1)/e;      $status_display=~s/^([a-z])/uc($1)/e;
     my $criteria_info.=      my $criteria_info.=
  '<div class="LC_'.$status.' LC_criteria"><h4>'   '<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>'
  .$mandatory.' Criteria</h4><p>';   .$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">'
    ."\n";
       $criteria =~ s/^\s*//s;
       $criteria =~ s/\s*$//s;
     $criteria_info.= $criteria;      $criteria_info.= $criteria;
     $criteria_info.='</p><p class="LC_grade">'.$status_display.'</p>';      $criteria_info.="\n\t".'</p>'.
    "\n\t".'<p class="LC_grade">'.$status_display.'</p>';
     if ($comment =~ /\w/) {      if ($comment =~ /\w/) {
  $criteria_info.='<p class="LC_comment">'.   $criteria_info.=
     &mt('Comment: [_1]',$comment).'</p>';      "\n\t".
       '<p class="LC_comment">'.&mt('Comment: [_1]',$comment).'</p>';
     }      }
     $criteria_info.='</div>';      $criteria_info.="\n".'</div>'."\n";
       
     return $criteria_info;      return $criteria_info;
 }  }
   
Line 2635  sub layout_webgrade_Criteria { Line 2669  sub layout_webgrade_Criteria {
     my $link=&link($id);      my $link=&link($id);
     my $version = &get_version();      my $version = &get_version();
     my $status  = &get_criteria('status',$version,$dim,$id);      my $status  = &get_criteria('status',$version,$dim,$id);
     my $result =       my %lt = ( 'ungraded' => 'Ungraded',
  '<div class="LC_GRADING_criteria">'."\n".         'fail'     => 'Fail',
  '<div class="LC_GRADING_criteriatext">'."\n".         'pass'     => 'Pass',
  $criteria.         'review'   => 'Review',
  '</div>'."\n".         'comment'  => 'Additional Comment for Student',
  '<div class="LC_GRADING_grade">'."\n".         );
  '<label class="LC_GRADING_ungraded">      %lt = &Apache::lonlocal::texthash(%lt);
             <input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.      my $comment = &get_criteria('comment',$version,$dim,$id);
     &mt('Ungraded').      $comment = &HTML::Entities::encode($comment,'<>"&');
  '</label>'."\n".      my %checked;
  '<label class="LC_GRADING_fail">      foreach my $which ('ungraded','fail','pass','review') {
             <input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.   if ($status eq $which) { $checked{$which} = 'checked="checked"'; }
     &mt('Fail').      }
  '</label>'."\n".      if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; }
  '<label class="LC_GRADING_pass">      my $buttons;
              <input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.      foreach my $which  ('ungraded','fail','pass','review') {
      &mt('Pass').   $buttons .= <<END_BUTTON;
   '</label>'."\n".   <label class="LC_GRADING_$which">
   '<label class="LC_GRADING_review">   <input type="radio" name="HWVAL_$link" value="$which" $checked{$which} />
              <input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.   $lt{$which}
      &mt('Review').   </label>
   '</label>'."\n".  END_BUTTON
   '</div>'."\n".      }
   '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".      $criteria =~ s/^\s*//s;
   '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode(&get_criteria('comment',$version,$dim,$id),'<>"&').'</textarea>'."\n".      $criteria =~ s/\s*$//s;
   '</label>'."\n".      my $result = <<END_CRITERIA;
   '</div>'."\n".  <div class="LC_GRADING_criteria">
   &grading_history($version,$dim,$id);   <div class="LC_GRADING_criteriatext">
    $criteria
    </div>
    <div class="LC_GRADING_grade">
   $buttons
    </div>
    <label class="LC_GRADING_comment">
    $lt{'comment'}
    <textarea class="LC_GRADING_comment_area" name="HWVAL_comment_$link">$comment</textarea>
    </label>
   </div>
   END_CRITERIA
       $result .= &grading_history($version,$dim,$id);
     return $result;      return $result;
 }  }
   
Removed from v.1.197  
changed lines
  Added in v.1.205

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