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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.78 and 1.89

version 1.78, 2011/03/25 01:34:49 version 1.89, 2011/05/24 17:17:24
Line 62  sub real_handler { Line 62  sub real_handler {
     $r->send_http_header;      $r->send_http_header;
   
     my $showPoints =      my $showPoints =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';          (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard')
         || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
     my $notshowSPRSlink =      my $notshowSPRSlink =
         (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')          (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));        || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
Line 266  sub getData { Line 267  sub getData {
     $totalRight += $score;      $totalRight += $score;
     $partsCount += $curRes->weight($part);      $partsCount += $curRes->weight($part);
   
                       $curRes->{DATA}->{PROB_SCORE}  += $score;
                       $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part);
   
     if ($curRes->opendate($part) < $now) {      if ($curRes->opendate($part) < $now) {
  $totalPossible += $curRes->weight($part);   $totalPossible += $curRes->weight($part);
                           $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part);
     }      }
     $totalParts += $curRes->weight($part);      $totalParts += $curRes->weight($part);
  } else {   } else {
Line 459  sub outputCategories { Line 464  sub outputCategories {
     &output_category_table($r,$cangrade,$navmap,%categories);      &output_category_table($r,$cangrade,$navmap,%categories);
 #  #
     if ($cangrade) {      if ($cangrade) {
         $r->print('<input type="hidden" name="storemove" value="" />'.          $r->print(&Apache::loncommon::resourcebrowser_javascript().
                     '<input type="hidden" name="storemove" value="" />'.
                   '<input type="hidden" name="cmd" value="" />'.                    '<input type="hidden" name="cmd" value="" />'.
                     '<input type="hidden" name="resourcesymb" value="" />'.
                   '<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{$_});
   #    }
   }
   
   #
   # Get data for all symbs
   #
   
   sub dumpdata {
       my ($navmap)=@_;
       my %returndata=();
   
   # Run through the map and get all data
   
       my $iterator = $navmap->getIterator(undef, undef, undef, 1);
       my $depth = 1;
       $iterator->next(); # ignore first BEGIN_MAP
       my $curRes = $iterator->next();
   
       while ($depth > 0) {
           if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
           if ($curRes == $iterator->END_MAP()) { $depth--; }
           if (ref($curRes)) {
               if ($curRes->is_map()) {
                   $returndata{$curRes->symb()}='folder:'.$curRes->{DATA}->{CHILD_PARTS}.':'.$curRes->{DATA}->{CHILD_ATTEMPTED}.':'.$curRes->{DATA}->{CHILD_CORRECT};
               } else {
                   $returndata{$curRes->symb()}='res:'.$curRes->{DATA}->{PROB_WEIGHT}.':'.$curRes->{DATA}->{PROB_POSSIBLE}.':'.$curRes->{DATA}->{PROB_SCORE};
               } 
           }
           $curRes = $iterator->next();
       }
       return %returndata;
 }  }
   
 #  #
Line 475  sub process_category_edits { Line 519  sub process_category_edits {
     unless ($cangrade) { return %categories; }      unless ($cangrade) { return %categories; }
 # First store everything  # First store everything
     foreach my $id (split(/\,/,$categories{'order'})) {      foreach my $id (split(/\,/,$categories{'order'})) {
   # Set names, types, and weight (there is only one of each per category)
         %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);          %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);
         %categories=&set_category_total($cangrade,$id,$env{'form.totaltype_'.$id},$env{'form.total_'.$id},%categories);          %categories=&set_category_total($cangrade,$id,$env{'form.totaltype_'.$id},$env{'form.total_'.$id},%categories);
         %categories=&set_category_weight($cangrade,$id,$env{'form.weight_'.$id},%categories);          %categories=&set_category_weight($cangrade,$id,$env{'form.weight_'.$id},%categories);
 # More changes here          %categories=&set_category_displayachieved($cangrade,$id,$env{'form.displayachieved_'.$id},%categories);
   # Set values for category rules (before names may change)
           %categories=&set_category_rules($cangrade,$id,%categories);
     }      }
   
 # Now deal with commands  # Now deal with commands
Line 492  sub process_category_edits { Line 539  sub process_category_edits {
     } elsif ($cmd=~/^delcat\_(.+)$/) {      } elsif ($cmd=~/^delcat\_(.+)$/) {
         %categories=&del_category($1,$cangrade,%categories);          %categories=&del_category($1,$cangrade,%categories);
     } elsif ($cmd=~/^addcont\_(.+)$/) {      } elsif ($cmd=~/^addcont\_(.+)$/) {
         %categories=&add_category_content($1,$cangrade,$env{'form.addcont_'.$1.'_symb'},%categories);          %categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories);
     } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {      } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {
         %categories=&del_category_content($1,$cangrade,$2,%categories);          %categories=&del_category_content($1,$cangrade,$2,%categories);
     } elsif ($cmd=~/^newrule\_(.+)$/) {      } elsif ($cmd=~/^newrule\_(.+)$/) {
         %categories=&add_calculation_rule($1,$cangrade,':',%categories);          %categories=&add_calculation_rule($1,$cangrade,':',%categories);
       } elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) {
           %categories=&del_calculation_rule($1,$cangrade,$2,%categories);
     }      }
 # Move to a new position  # Move to a new position
     my $moveid=$env{'form.storemove'};      my $moveid=$env{'form.storemove'};
Line 520  sub output_category_table { Line 569  sub output_category_table {
 #  #
     my @order=split(/\,/,$categories{'order'});      my @order=split(/\,/,$categories{'order'});
 #  #
       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,%categories);          my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
         $sum+=$value*$weight;          $sum+=$value*$weight;
         $total+=$weight;          $total+=$weight;
     }      }
Line 541  sub output_category_table_header { Line 591  sub output_category_table_header {
     }      }
     $r->print('<th>'.&mt('Category').'</th>'.      $r->print('<th>'.&mt('Category').'</th>'.
               '<th>'.&mt('Contents').'</th>'.                '<th>'.&mt('Contents').'</th>'.
               '<th>'.&mt('Calculation').'</th>'.  
               '<th>'.&mt('Total Points').'</th>'.                '<th>'.&mt('Total Points').'</th>'.
               '<th>'.&mt('Relative Weight').'</th>');                '<th>'.&mt('Calculation').'</th>'.
                 '<th>'.&mt('Relative Weight').'</th>'.
                 '<th>'.&mt('Achieved').'</th>');
     $r->print(&Apache::loncommon::end_data_table_header_row());      $r->print(&Apache::loncommon::end_data_table_header_row());
 }  }
   
Line 553  sub output_category_table_header { Line 604  sub output_category_table_header {
 #  #
   
 sub output_and_calc_category {  sub output_and_calc_category {
     my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,%categories)=@_;      my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_;
     my $value=0;      my $value=0;
     my $weight=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',
            'dw' => 'Move Down');             'dw' => 'Move Down');
     $r->print("\n".&Apache::loncommon::start_data_table_row());      if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }
   
     if ($cangrade) {      if ($output && $cangrade) {
         $r->print(<<ENDMOVE);          $r->print(<<ENDMOVE);
 <td>  <td>
 <div class="LC_docs_entry_move">  <div class="LC_docs_entry_move">
Line 589  ENDMOVE Line 640  ENDMOVE
         $r->print('<td><a href="javascript:storecmd(\'delcat_'.$id.'\');">'.&mt('Delete').'</a></td>');          $r->print('<td><a href="javascript:storecmd(\'delcat_'.$id.'\');">'.&mt('Delete').'</a></td>');
         $r->print('<td><input type="text" name="name_'.$id.          $r->print('<td><input type="text" name="name_'.$id.
                   '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>');                    '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>');
     } else {      } elsif ($output) {
         $r->print('<td>'.$categories{$id.'_name'}.'</td>');          $r->print('<td>'.$categories{$id.'_name'}.'</td>');
     }      }
 # Content  # Content display and summing up of points
     $r->print('<td><ul>');      my $totalpossible=0;
       my $totalcorrect=0;
       if ($output) { $r->print('<td><ul>'); }
     foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {      foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
         $r->print('<li>');          my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
         $r->print(&Apache::lonnet::gettitle($contentid));          $totalpossible+=$possible;
         if ($cangrade) {          $totalcorrect+=$correct;
            $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');          if ($output) {
         }             $r->print('<li>');
         $r->print('</li>');             $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');
              if ($cangrade) {
                 $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
              }
              $r->print('</li>');
           }
       }
       if ($output) {
          $r->print('</ul>');
          $r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); 
          if ($cangrade) {
              $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');
          }
          $r->print('</td>'); 
     }      }
     $r->print('</ul>');  # Total
     if ($cangrade) {      if ($cangrade) {
         $r->print('<br />'.&mt('Add Problem or Sequence').'<br />'.         if ($output) { 
                   &Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'));            $r->print('<td>'.
                     '<select name="totaltype_'.$id.'">'.
                     '<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.
                     '<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.
                     '</select>'.
                     '<input type="text" size="4" name="total_'.$id.
                     '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" /></td>'); 
          }
       } else {
          if ($output) {
             $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>');
          }
     }      }
     $r->print('</td>');   
   
 # Calculation  # Calculation
     $r->print('<td><ul>');      if ($output) { $r->print('<td><ul>'); }
     foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {      foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
         $r->print('<li>');          if ($output) { $r->print('<li>'); }
         my ($code,$value)=split(/\:/,$calcrule);          my ($code,$value)=split(/\:/,$calcrule);
         $r->print(&pretty_prt_rule($cangrade,$id,$code,$value));          if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); }
         if ($cangrade) {          if ($cangrade) {
            $r->print(' <a href="javascript:storecmd(\'delcalc_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>');             if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); }
         }          }
         $r->print('</li>');          if ($output) { $r->print('</li>'); }
     }      }
     $r->print('</ul>');      if ($output) { $r->print('</ul>'); }
     if ($cangrade) {      if ($cangrade) {
         $r->print('<br />'.&new_calc_rule_form($id));          if ($output) { $r->print('<br />'.&new_calc_rule_form($id)); }
     }      }
     $r->print('</td>');      if ($output) { $r->print('</td>'); }
   
   
 # Total  
     if ($cangrade) {  
        $r->print('<td>'.  
                   '<select name="totaltype_'.$id.'">'.  
                   '<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.  
                   '<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.  
                   '</select>'.  
                   '<input type="text" size="4" name="total_'.$id.  
                   '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" /></td>');  
     } else {  
         $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>');  
     }  
 # Weight  # Weight
     if ($cangrade) {      if ($cangrade) {
        $r->print('<td>'.         if ($output) { 
             $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($categories{$id.'_weight'}).'" /></td>');
          }
       } else {
          if ($output) {
             $r->print('<td>'.$categories{$id.'_weight'}.'</td>');
          }
       }
   # Achieved
       if ($output) { $r->print('<td>'); }
       if ($cangrade) {
           if ($output) {
              $r->print('<select name="displayachieved_'.$id.'">'.
                     '<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'.
                     '<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'.
                     '</select>');
           }
     } else {      } else {
         $r->print('<td>'.$categories{$id.'_weight'}.'</td>');          if ($output) {
               if ($categories{$id.'_displayachieved'} eq 'percent') {
                   $r->print(&mt('percent'));
               } else {
                   $r->print(&mt('points'));
               }
           }
     }      }
       if ($output) { $r->print('</td>'); }
   
     return ($value,$weight);      return ($value,$weight);
 }  }
Line 660  sub bottom_line_category { Line 748  sub bottom_line_category {
     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="5">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');      $r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');
 }  }
   
 #  #
Line 684  sub make_new_category { Line 772  sub make_new_category {
     }      }
     $categories{$id.'_weight'}=0;      $categories{$id.'_weight'}=0;
     $categories{$id.'_totaltype'}='default';      $categories{$id.'_totaltype'}='default';
       $categories{$id.'_displayachieved'}='percent';
     return %categories;      return %categories;
 }  }
   
   
 # === Calculation Rule Editing  # === Calculation Rule Editing
   
 sub pretty_prt_rule {  sub category_rule_codes {
     my ($cangrade,$id,$code,$value)=@_;      return &Apache::lonlocal::texthash(
     my $cid=$id.'_'.$code;  
     my %lt=&Apache::lonlocal::texthash(  
                 'droplow'  => 'Drop N lowest grade assignments',                  'droplow'  => 'Drop N lowest grade assignments',
                 'drophigh' => 'Drop N highest grade assignments',                  'drophigh' => 'Drop N highest grade assignments',
                 'capabove' => 'Cap percentage above N percent',                  'capabove' => 'Cap percentage above N percent',
                 'capbelow' => 'Cap percentage below N percent');                  'capbelow' => 'Cap percentage below N percent');
   }
   
   sub pretty_prt_rule {
       my ($cangrade,$id,$code,$value)=@_;
       my $cid=$id.'_'.$code;
       my %lt=&category_rule_codes();
     my $ret='<span class="LC_nobreak">';      my $ret='<span class="LC_nobreak">';
     if ($cangrade) {      if ($cangrade) {
         $ret.='<select name="sel_'.$cid.'">';          $ret.='<select name="sel_'.$cid.'">';
         foreach my $calc (''=>'',sort(keys(%lt))) {          foreach my $calc (''=>'',sort(keys(%lt))) {
             $ret.='<option value="'.$calc.'"'.($calc eq $code?' selected="selected"':'').' />'.$lt{$calc}.'</input>';              $ret.='<option value="'.$calc.'"'.($calc eq $code?' selected="selected"':'').' />'.$lt{$calc}.'</input>';
         }          }
         $ret.='</select> N=<input type="text" size="5" name="val_'.$cid.'" /></span>';          $ret.='</select> N=<input type="text" size="5" name="val_'.$cid.'" value="'.$value.'" /></span>';
     } else {      } else {
         $ret.=$lt{$code}.'; N='.$value;          $ret.=$lt{$code}.'; N='.$value;
     }      }
Line 749  sub del_calculation_rule { Line 842  sub del_calculation_rule {
     return %categories;      return %categories;
 }  }
   
   sub set_category_rules {
       my ($cangrade,$id,%categories)=@_;
       unless ($cangrade) { return %categories; }
       my %lt=&category_rule_codes();
       my @newrules=();
       foreach my $code ('',(keys(%lt))) {
           if ($env{'form.sel_'.$id.'_'.$code}) {
               push(@newrules,$env{'form.sel_'.$id.'_'.$code}.':'.$env{'form.val_'.$id.'_'.$code});
           }
       }
       $categories{$id.'_calculations'}=join(',',sort(@newrules));
       return %categories;
   }
   
   
 # === Category Editing  # === Category Editing
   
 #  #
Line 758  sub del_calculation_rule { Line 866  sub del_calculation_rule {
 sub add_category_content {  sub add_category_content {
     my ($id,$cangrade,$newcontent,%categories)=@_;      my ($id,$cangrade,$newcontent,%categories)=@_;
     unless ($cangrade) { return %categories; }      unless ($cangrade) { return %categories; }
       &Apache::lonnet::logthis("In here $newcontent");
     my %newcontent=($newcontent => 1);      my %newcontent=($newcontent => 1);
     foreach my $current (split(/\,/,$categories{$id.'_content'})) {      foreach my $current (split(/\,/,$categories{$id.'_content'})) {
         $newcontent{$current}=1;          $newcontent{$current}=1;
Line 910  sub set_category_weight { Line 1019  sub set_category_weight {
     return %categories;      return %categories;
 }  }
   
   sub set_category_displayachieved {
       my ($cangrade,$id,$value,%categories)=@_;
       unless ($cangrade) { return %categories; }
       unless (($value eq 'percent') || ($value eq 'points')) { $value='percent'; }
       $categories{$id.'_displayachieved'}=$value;
       return %categories;
   }
   
   
 #  #
 # === end category-related  # === end category-related
 #  #
Removed from v.1.78  
changed lines
  Added in v.1.89

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.