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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.93 and 1.98

version 1.93, 2011/05/26 18:02:22 version 1.98, 2011/06/02 01:34:34
Line 35  use Apache::loncommon; Line 35  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::grades;  use Apache::grades;
   use Time::HiRes;
   my $time=0;
   
   sub tim {
       my ($label)=@_;
       my $tt=&Time::HiRes::time();
       my $dt=$tt-$time;
       &Apache::lonnet::logthis("qg $label ".$dt);
       $time=$tt;
   }
   
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 242  sub getData { Line 253  sub getData {
             my $stack = $iterator->getStack();              my $stack = $iterator->getStack();
                           
             for my $part (@{$parts}) {              for my $part (@{$parts}) {
  my $completionStatus = $curRes->getCompletionStatus($part);  
  my $dateStatus = $curRes->getDateStatus($part);   my $dateStatus = $curRes->getDateStatus($part);
                   my $weight = $curRes->weight($part);
                 if ($completionStatus == $curRes->EXCUSED()) {                  my $problemstatus = $curRes->problemstatus($part);
   
                   if ($curRes->solved($part) eq 'excused') {
                     next;                      next;
                 }                  }
  if ($showPoints) {   if ($showPoints) {
     my $score = 0;      my $score = 0;
     # If we're not telling status and the answer date isn't passed yet,       # If we're not telling status and the answer date isn't passed yet, 
     # it's an "attempted" point      # it's an "attempted" point
     if ((($curRes->problemstatus($part) eq 'no') ||      if ((($problemstatus eq 'no') ||
                         ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&                           ($problemstatus eq 'no_feedback_ever')) &&
  ($dateStatus != $curRes->ANSWER_OPEN)) {   ($dateStatus != $curRes->ANSWER_OPEN)) {
  my $status = $curRes->simpleStatus($part);   my $status = $curRes->simpleStatus($part);
  if ($status == $curRes->ATTEMPTED) {   if ($status == $curRes->ATTEMPTED) {
     $partsAttempted += $curRes->weight($part);      $partsAttempted += $weight;
     $totalAttempted += $partsAttempted;      $totalAttempted += $partsAttempted;
  }   }
     } else {      } else {
  $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));   $score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
     }      }
     $partsRight += $score;      $partsRight += $score;
     $totalRight += $score;      $totalRight += $score;
     $partsCount += $curRes->weight($part);      $partsCount += $weight;
   
                     $curRes->{DATA}->{PROB_SCORE}  += $score;                      $curRes->{DATA}->{PROB_SCORE}  += $score;
                     $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part);                      $curRes->{DATA}->{PROB_WEIGHT} += $weight;
   
     if ($curRes->opendate($part) < $now) {      if ($curRes->opendate($part) < $now) {
  $totalPossible += $curRes->weight($part);   $totalPossible += $weight;
                         $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part);                          $curRes->{DATA}->{PROB_POSSIBLE} += $weight;
     }      }
     $totalParts += $curRes->weight($part);      $totalParts += $weight;
  } else {   } else {
     my $status = $curRes->simpleStatus($part);      my $status = $curRes->simpleStatus($part);
     my $thisright = 0;      my $thisright = 0;
Line 291  sub getData { Line 303  sub getData {
  $totalAttempted++;   $totalAttempted++;
     }      }
           
     my $dateStatus = $curRes->getDateStatus($part);  
     $totalParts++;      $totalParts++;
     if ($curRes->opendate($part) < $now) {      if ($curRes->opendate($part) < $now) {
  $totalPossible++;   $totalPossible++;
Line 588  sub process_category_edits { Line 599  sub process_category_edits {
   
 sub output_category_table {  sub output_category_table {
     my ($r,$cangrade,$navmaps,%categories)=@_;      my ($r,$cangrade,$navmaps,%categories)=@_;
     my $sum=0;      
     my $total=0;      my $totalweight=0;
       my $totalpoints=0;
   
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
 #  #
     &output_category_table_header($r,$cangrade);      &output_category_table_header($r,$cangrade);
Line 599  sub output_category_table { Line 612  sub output_category_table {
     my %performance=&dumpdata($navmaps);      my %performance=&dumpdata($navmaps);
     my $maxpos=$#order;      my $maxpos=$#order;
     for (my $i=0;$i<=$maxpos;$i++) {      for (my $i=0;$i<=$maxpos;$i++) {
         my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);          my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
         $sum+=$value*$weight;          unless ($possible) { next; }
         $total+=$weight;          $totalpoints+=$weight*$correct/$possible;
           $totalweight+=$weight;
     }      }
 #  #
     &bottom_line_category($r,$cangrade,$sum,$total);      my $perc=0;
       if ($totalweight) { $perc=100.*$totalpoints/$totalweight; }
   
       &bottom_line_category($r,$cangrade,$perc);
 #  #
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
     return $sum;      return $perc;
 }  }
   
 sub output_category_table_header {  sub output_category_table_header {
Line 632  sub output_category_table_header { Line 649  sub output_category_table_header {
   
 sub output_and_calc_category {  sub output_and_calc_category {
     my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_;      my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_;
     my $value=0;  
     my $weight=0;  
     my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");      my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
            'up' => 'Move Up',             'up' => 'Move Up',
Line 682  ENDMOVE Line 698  ENDMOVE
         if ($possible>0) { push(@individual,"$possible:$correct"); }          if ($possible>0) { push(@individual,"$possible:$correct"); }
         if ($output) {          if ($output) {
            $r->print('<li>');             $r->print('<li>');
            $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');             $r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')');
            if ($cangrade) {             if ($cangrade) {
               $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');                $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
            }             }
Line 694  ENDMOVE Line 710  ENDMOVE
        if ($cangrade) {         if ($cangrade) {
            $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');             $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');
        }         }
        $r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');         $r->print('<p><b>'.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
        $r->print('</td>');          $r->print('</td>'); 
     }      }
 # Total  # Total
Line 719  ENDMOVE Line 735  ENDMOVE
        $totalpossible=1.*$categories{$id.'_total'};         $totalpossible=1.*$categories{$id.'_total'};
     }      }
     if ($output) {      if ($output) {
        $r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');         $r->print('<p><b>'.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
     }      }
   
   
Line 745  ENDMOVE Line 761  ENDMOVE
                 }                  }
             }              }
         } elsif ($code eq 'droplow') {          } elsif ($code eq 'droplow') {
             ($totalcorrect,@individual)=&drop(0,0,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual);
         } elsif ($code eq 'drophigh') {          } elsif ($code eq 'drophigh') {
             ($totalcorrect,@individual)=&drop(1,0,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual);
         } elsif ($code eq 'droplowperc') {          } elsif ($code eq 'droplowperc') {
             ($totalcorrect,@individual)=&drop(0,1,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual);
         } elsif ($code eq 'drophighperc') {          } elsif ($code eq 'drophighperc') {
             ($totalcorrect,@individual)=&drop(1,1,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual);
         }          }
         if ($output) { $r->print('</li>'); }          if ($output) { $r->print('</li>'); }
     }      }
   # Re-adjust total points if force total
       if ($categories{$id.'_totaltype'} eq 'typein') {
          $totalpossible=1.*$categories{$id.'_total'};
       }
   
     if ($output) {       if ($output) { 
         $r->print('</ul>');           $r->print('</ul>'); 
         if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }          if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }
         $r->print('<p>'.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');          $r->print('<p><b>'.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
         $r->print('</td>');           $r->print('</td>'); 
     }      }
   #
   # Prepare for export
   #
 # Weight  # Weight
       my $weight=$categories{$id.'_weight'};
       unless (1.*$weight>0) { $weight=0; }
     if ($cangrade) {      if ($cangrade) {
        if ($output) {          if ($output) { 
           $r->print('<td>'.            $r->print('<td>'.
                   '<input type="text" size="4" name="weight_'.$id.                    '<input type="text" size="4" name="weight_'.$id.
                   '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>');                    '" value="'.&Apache::lonhtmlcommon::entity_encode($weight).'" /></td>');
        }         }
     } else {      } else {
        if ($output) {         if ($output) {
           $r->print('<td>'.$categories{$id.'_weight'}.'</td>');            $r->print('<td>'.$weight.'</td>');
        }         }
     }      }
 # Achieved  # Achieved
       my $type=$categories{$id.'_displayachieved'};
       unless (($type eq 'percent') || ($type eq 'points')) { $type='points'; }
     if ($output) { $r->print('<td>'); }      if ($output) { $r->print('<td>'); }
     if ($cangrade) {      if ($cangrade) {
         if ($output) {          if ($output) {
            $r->print('<select name="displayachieved_'.$id.'">'.             $r->print('<select name="displayachieved_'.$id.'">'.
                   '<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.                    '<option value="percent"'.($type eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.
                   '<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.                    '<option value="points"'.($type eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.
                   '</select>');                    '</select>');
         }          }
     } else {      }
         if ($output) {      if ($output) {
             if ($categories{$id.'_displayachieved'} eq 'percent') {          $r->print('<p><b>');
                 $r->print(&mt('percent'));          if ($type eq 'percent') {
             } else {              my $perc='---';
                 $r->print(&mt('points'));              if ($totalpossible) {
                   $perc=100.*$totalcorrect/$totalpossible;
             }              }
               $r->print(&mt('[_1] percent',&numberout($perc)));
           } else {
               $r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible)));
         }          }
           $r->print('</b></p>');
     }      }
     if ($output) { $r->print('</td>'); }      if ($output) { $r->print('</td>'); }
   
     return ($value,$weight);      return ($totalcorrect,$totalpossible,$type,$weight);
 }  }
   
 #  #
Line 803  ENDMOVE Line 835  ENDMOVE
   
 sub drop {  sub drop {
     my ($high,$percent,$n,@individual)=@_;      my ($high,$percent,$n,@individual)=@_;
   # Sort assignments by points or percent
     my @newindividual=sort {      my @newindividual=sort {
         my ($pa,$ca)=split(/\:/,$a);          my ($pa,$ca)=split(/\:/,$a);
         my ($pb,$cb)=split(/\:/,$b);          my ($pb,$cb)=split(/\:/,$b);
Line 816  sub drop { Line 849  sub drop {
             $ca<=>$cb;              $ca<=>$cb;
         }          }
     } @individual;      } @individual;
   # Drop the ones we don't want
     if ($#newindividual>=$n) {      if ($#newindividual>=$n) {
         if ($high) {          if ($high) {
            splice(@newindividual,$#newindividual+1-$n,$n);             splice(@newindividual,$#newindividual+1-$n,$n);
Line 825  sub drop { Line 859  sub drop {
     } else {      } else {
         @newindividual=();          @newindividual=();
     }      }
   # Re-calculate how many points possible and achieved
       my $newpossible=0;
     my $newcorrect=0;      my $newcorrect=0;
     for my $score (@newindividual) {      for my $score (@newindividual) {
         $newcorrect+=(split(/\:/,$score))[1];          my ($thispossible,$thiscorrect)=(split(/\:/,$score));
           $newpossible+=$thispossible;
           $newcorrect+=$thiscorrect;
     }      }
     return ($newcorrect,@newindividual);      return ($newpossible,$newcorrect,@newindividual);
 }   } 
 #  #
 # Bottom line with grades  # Bottom line with grades
 #  #
   
 sub bottom_line_category {  sub bottom_line_category {
     my ($r,$cangrade,$sum,$total)=@_;      my ($r,$cangrade,$perc)=@_;
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
     if ($cangrade) {      if ($cangrade) {
         $r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');          $r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');
     }      }
     $r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');      $r->print('<td colspan="6"><b>'.&mt('Total: [_1] percent',&numberout($perc)).'</b></td>');
 }  }
   
   sub numberout {
       my ($number)=@_;
       my $printout=sprintf("%.3f", $number);
       $printout=~s/0+$//;
       $printout=~s/\.$//;
       return $printout;
   }
 #  #
 # Make one new category  # Make one new category
 #  #
Removed from v.1.93  
changed lines
  Added in v.1.98

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