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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.96 and 1.100

version 1.96, 2011/06/01 20:32:30 version 1.100, 2011/06/03 01:07:22
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 Apache::loncoursedata;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 130  sub real_handler { Line 131  sub real_handler {
   
 }  }
   
   sub getStudentCatGrade {
       my ($uname,$udom,%categories)=@_;
       my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
          &getData(1,$uname,$udom);
       return &output_category_table(undef,0,$navmap,0,%categories);
   }
   
   sub getAllStudentData {
       my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
       my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
   
       my %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
   
       my $classlist = &Apache::loncoursedata::get_classlist();
   
       my $statusidx   = &Apache::loncoursedata::CL_STATUS();
       my $usernameidx = &Apache::loncoursedata::CL_SNAME();
       my $domainidx   = &Apache::loncoursedata::CL_SDOM();
       my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME();
   
       foreach my $key (keys(%{$classlist})) {
           my $student = $classlist->{$key};
           my $perc=&getStudentCatGrade($classlist->{$student}->[$usernameidx],
                                        $classlist->{$student}->[$domainidx],
                                        %categories);
       }
   }
   
   
 sub startGradeScreen {  sub startGradeScreen {
     my ($r,$mode)=@_;      my ($r,$mode)=@_;
   
Line 242  sub getData { Line 272  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 322  sub getData {
  $totalAttempted++;   $totalAttempted++;
     }      }
           
     my $dateStatus = $curRes->getDateStatus($part);  
     $totalParts++;      $totalParts++;
     if ($curRes->opendate($part) < $now) {      if ($curRes->opendate($part) < $now) {
  $totalPossible++;   $totalPossible++;
Line 461  sub outputCategories { Line 491  sub outputCategories {
         &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);          &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
     }      }
 # new categories loaded now  # new categories loaded now
     &output_category_table($r,$cangrade,$navmap,%categories);      &output_category_table($r,$cangrade,$navmap,1,%categories);
 #  #
     if ($cangrade) {      if ($cangrade) {
         $r->print(&Apache::loncommon::resourcebrowser_javascript().          $r->print(&Apache::loncommon::resourcebrowser_javascript().
Line 471  sub outputCategories { Line 501  sub outputCategories {
                   '<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'.                    '<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'.
                   '<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');                    '<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');
     }      }
 #  
 # Debug  
 #  
 #    my %data=&dumpdata($navmap);  
 #    foreach (keys(%data)) {  
 #        $r->print("\n<br />".$_.'='.$data{$_});  
 #    }  
 #   my @debugarray=('5:1','4:3','1:1','5:5','6:7');  
 #   $r->print("Array: ".join(',',@debugarray).'<br />');  
 #   $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).'<br />');  
 #   $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).'<br />');  
 #   $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).'<br />');  
 #   $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).'<br />');  
 #  
 #   $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).'<br />');  
 #   $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).'<br />');  
 #   $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).'<br />');  
 #   $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).'<br />');  
 #  
 #   $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).'<br />');  
 #   $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).'<br />');  
 #   $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).'<br />');  
 #   $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).'<br />');  
 #  
 #   $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).'<br />');  
 #   $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).'<br />');  
 #   $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).'<br />');  
 #   $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).'<br />');  
 #  
 #   $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).'<br />');  
 #   $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).'<br />');  
 #   $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).'<br />');  
 #   $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).'<br />');  
   
 }  }
   
 #  #
Line 587  sub process_category_edits { Line 583  sub process_category_edits {
 #  #
   
 sub output_category_table {  sub output_category_table {
     my ($r,$cangrade,$navmaps,%categories)=@_;      my ($r,$cangrade,$navmaps,$output,%categories)=@_;
           
     my $totalweight=0;      my $totalweight=0;
     my $totalpoints=0;      my $totalpoints=0;
   
     $r->print(&Apache::loncommon::start_data_table());      if ($output) { 
          $r->print(&Apache::loncommon::start_data_table());
 #  #
     &output_category_table_header($r,$cangrade);         &output_category_table_header($r,$cangrade);
       }
 #  #
     my @order=split(/\,/,$categories{'order'});      my @order=split(/\,/,$categories{'order'});
 #  #
     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 ($correct,$possible,$type,$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,$output,%categories);
         unless ($possible) { next; }          unless ($possible) { next; }
         $totalpoints+=$weight*$correct/$possible;          $totalpoints+=$weight*$correct/$possible;
         $totalweight+=$weight;          $totalweight+=$weight;
Line 610  sub output_category_table { Line 608  sub output_category_table {
     my $perc=0;      my $perc=0;
     if ($totalweight) { $perc=100.*$totalpoints/$totalweight; }      if ($totalweight) { $perc=100.*$totalpoints/$totalweight; }
   
     &bottom_line_category($r,$cangrade,$perc);      if ($output) { 
 #          &bottom_line_category($r,$cangrade,$perc); 
     $r->print(&Apache::loncommon::end_data_table());          $r->print(&Apache::loncommon::end_data_table());
       }
     return $perc;      return $perc;
 }  }
   
Line 638  sub output_category_table_header { Line 637  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)=@_;
       
       if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }
   
     my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");      if ($output && $cangrade) {
     my %lt=&Apache::lonlocal::texthash(          my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
           my %lt=&Apache::lonlocal::texthash(
            'up' => 'Move Up',             'up' => 'Move Up',
            'dw' => 'Move Down');             'dw' => 'Move Down');
     if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }  
   
     if ($output && $cangrade) {  
         $r->print(<<ENDMOVE);          $r->print(<<ENDMOVE);
 <td>  <td>
 <div class="LC_docs_entry_move">  <div class="LC_docs_entry_move">
Removed from v.1.96  
changed lines
  Added in v.1.100

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