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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.70 and 1.94

version 1.70, 2011/02/20 23:38:00 version 1.94, 2011/05/27 19:32:10
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 80  sub real_handler { Line 81  sub real_handler {
   
     &startGradeScreen($r,'quick');      &startGradeScreen($r,'quick');
   
     $r->rflush();      my $cangrade=&Apache::lonnet::allowed('mgr');
   #
 #    my $uname='korte';  # Pick student
 #    my $udom='gerd';  #
   
     my $uname;      my $uname;
     my $udom;      my $udom;
       my $stdid;
       if ($cangrade) {
           if ($env{'form.uname'}) { $uname=$env{'form.uname'}; }
           if ($env{'form.udom'}) { $udom=$env{'form.udom'}; }
           if ($env{'form.id'}) { $stdid=$env{'form.id'}; }
           if (($stdid) && ($udom)) {
               $uname=(&Apache::lonnet::idget($udom,$stdid))[1];
           }
           if (($stdid) && (!$uname)) {
               $r->print('<p><span class="LC_warning">'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'</span></p>');
               $stdid='';
           }
           $r->print('<form method="post" name="quickform" action="/adm/quickgrades">');
           my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
              &Apache::loncommon::selectstudent_link('quickform','uname','udom');
           $r->print("<p>\n".&Apache::loncommon::studentbrowser_javascript()."\n");
           $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
                    ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
                    ,'<input type="text" value="'.$stdid.'" size="12" name="id" /> '
                    ,$chooseopt).'<br />'.
                    '<input type="submit" name="display" value="'.&mt('Update Display').'" /></p>');
           if (($uname) && ($udom)) {
               $r->print('<p>'.&mt('Full Name: [_1]',&Apache::loncommon::plainname($uname,$udom)).'</p>');
           }
       }
       $r->rflush();
   
     my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=      my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
        &getData($showPoints,$uname,$udom);         &getData($showPoints,$uname,$udom);
Line 98  sub real_handler { Line 124  sub real_handler {
        &outputTable($r,$showPoints,$notshowTotals,         &outputTable($r,$showPoints,$notshowTotals,
                  $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);                   $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
     }      }
       if ($cangrade) { $r->print("\n</form>\n"); }
     &endGradeScreen($r);      &endGradeScreen($r);
     return OK;      return OK;
   
Line 165  sub startGradeScreen { Line 192  sub startGradeScreen {
   
 sub endGradeScreen {  sub endGradeScreen {
    my ($r)=@_;     my ($r)=@_;
    $r->print('</div></div></div>');     $r->print('</div></div></div>'.&Apache::loncommon::end_page());
 }  }
   
   
Line 240  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 398  sub outputTable { Line 429  sub outputTable {
                  .&Apache::loncommon::end_data_table_row());                   .&Apache::loncommon::end_data_table_row());
     }      }
   
     $r->print(&Apache::loncommon::end_data_table()      $r->print(&Apache::loncommon::end_data_table());
              .&Apache::loncommon::end_page());  
   
 }  }
   
 #  #
Line 425  sub outputCategories { Line 454  sub outputCategories {
 # Loading old categories  # Loading old categories
     %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);      %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
 # Storing  # Storing
     if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne ''))) {      if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne '') || ($env{'form.cmd'} ne ''))) {
 # Process the changes  # Process the changes
         %categories=&process_category_edits($r,$cangrade,%categories);          %categories=&process_category_edits($r,$cangrade,%categories);
 # Actually store  # Actually store
         &Apache::lonnet::logthis("Storing ".$categories{'order'});  
         &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);          &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
     }      }
 # new categories loaded now  # new categories loaded now
 # Form only generated if user can change the grading categories  
     if ($cangrade) {  
         $r->print('<form method="post">');  
     }  
 #  
     &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="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" /></form>');                    '<input type="hidden" name="storemove" 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").'" />'.
                     '<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 />');
   
   }
   
   #
   # 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 453  sub outputCategories { Line 544  sub outputCategories {
 sub process_category_edits {  sub process_category_edits {
     my ($r,$cangrade,%categories)=@_;      my ($r,$cangrade,%categories)=@_;
     unless ($cangrade) { return %categories; }      unless ($cangrade) { return %categories; }
   # First store everything
       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_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_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
     my $cmd=$env{'form.cmd'};      my $cmd=$env{'form.cmd'};
     if ($cmd eq 'createnewcat') {      if ($cmd eq 'createnewcat') {
         %categories=&make_new_category($r,$cangrade,undef,%categories);          %categories=&make_new_category($r,$cangrade,undef,%categories);
       } elsif ($cmd=~/^up\_(.+)$/) {
           %categories=&move_up_category($1,$cangrade,%categories);
       } elsif ($cmd=~/^down\_(.+)$/) {
           %categories=&move_down_category($1,$cangrade,%categories);
     } elsif ($cmd=~/^delcat\_(.+)$/) {      } elsif ($cmd=~/^delcat\_(.+)$/) {
         %categories=&del_category($1,$cangrade,%categories);          %categories=&del_category($1,$cangrade,%categories);
     } else {      } elsif ($cmd=~/^addcont\_(.+)$/) {
 # Simply store the rest of the stuff          %categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories);
         foreach my $id (split(/\,/,$categories{'order'})) {      } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {
             %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);          %categories=&del_category_content($1,$cangrade,$2,%categories);
             %categories=&set_category_weight($cangrade,$id,$env{'form.weighttype_'.$id},$env{'form.weight_'.$id},%categories);      } elsif ($cmd=~/^newrule\_(.+)$/) {
 # More changes here          %categories=&add_calculation_rule($1,$cangrade,':',%categories);
         }      } elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) {
     }          %categories=&del_calculation_rule($1,$cangrade,$2,%categories);
       }
   # Move to a new position
       my $moveid=$env{'form.storemove'};
       if ($moveid) {
           %categories=&move_category($moveid,$cangrade,$env{'form.newpos_'.$moveid},%categories);
       } 
     return %categories;      return %categories;
 }  }
   
Line 483  sub output_category_table { Line 596  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 504  sub output_category_table_header { Line 618  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('Total Points').'</th>'.
               '<th>'.&mt('Calculation').'</th>'.                '<th>'.&mt('Calculation').'</th>'.
               '<th>'.&mt('Weight').'</th>'.                '<th>'.&mt('Relative Weight').'</th>'.
               '<th>'.&mt('Percent Overall').'</th>');                '<th>'.&mt('Achieved').'</th>');
     $r->print(&Apache::loncommon::end_data_table_header_row());      $r->print(&Apache::loncommon::end_data_table_header_row());
 }  }
   
Line 516  sub output_category_table_header { Line 631  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">
   <a href='/adm/quickgrades?cmd=up_$id&storechanges=1'>    <a href='javascript:storecmd("up_$id");'>
     <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />      <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
   </a>    </a>
 </div>  </div>
 <div class="LC_docs_entry_move">  <div class="LC_docs_entry_move">
   <a href='/adm/quickgrades?cmd=down_$id&storechanges=1'>    <a href='javascript:storecmd("down_$id");'>
     <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />      <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
   </a>    </a>
 </div>  </div>
Line 549  ENDMOVE Line 664  ENDMOVE
             }              }
         }          }
         $r->print("\n</select>\n</td>\n");          $r->print("\n</select>\n</td>\n");
         $r->print('<td><a href="/adm/quickgrades?cmd=delcat_'.$id.'&storechanges=1">'.&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
 # FIXME: just placeholders      my $totalpossible=0;
       my $totalcorrect=0;
       my @individual=();
       if ($output) { $r->print('<td><ul>'); }
       foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
           my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
           $totalpossible+=$possible;
           $totalcorrect+=$correct;
           if ($possible>0) { push(@individual,"$possible:$correct"); }
           if ($output) {
              $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>');
          if ($cangrade) {
              $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('</td>'); 
       }
   # Total
       if ($output) { $r->print('<td>'); }
     if ($cangrade) {      if ($cangrade) {
        $r->print("<td>Content Edit</td>");         if ($output) { 
             $r->print(
                     '<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'}).'" />'); 
          }
     } else {      } else {
        $r->print("<td>Content</td>");         if ($output) {
             $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}));
          }
     }      }
   # Adjust total points
       if ($categories{$id.'_totaltype'} eq 'typein') {
          $totalpossible=1.*$categories{$id.'_total'};
       }
       if ($output) {
          $r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
       }
   
   
 # Calculation  # Calculation
 # FIXME: just placeholders      if ($output) { $r->print('<td><ul>'); }
     if ($cangrade) {      foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
        $r->print("<td>Calculation Edit</td>");          if ($output) { $r->print('<li>'); }
     } else {          my ($code,$value)=split(/\:/,$calcrule);
        $r->print("<td>Calculation</td>");          if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); }
           if ($cangrade) {
              if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); }
           }
           if ($code eq 'capabove') {
               if ($totalpossible>0) {
                   if ($totalcorrect/$totalpossible>$value/100.) {
                       $totalcorrect=$totalpossible*$value/100.;
                   }
               }
           } elsif ($code eq 'capbelow') {
               if ($totalpossible>0) {
                   if ($totalcorrect/$totalpossible<$value/100.) {
                       $totalcorrect=$totalpossible*$value/100.;
                   }
               }
           } elsif ($code eq 'droplow') {
               ($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual);
           } elsif ($code eq 'drophigh') {
               ($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual);
           } elsif ($code eq 'droplowperc') {
               ($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual);
           } elsif ($code eq 'drophighperc') {
               ($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual);
           }
           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) { 
           $r->print('</ul>'); 
           if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }
           $r->print('<p>'.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
           $r->print('</td>'); 
       }
   
 # Weight  # Weight
     if ($cangrade) {      if ($cangrade) {
        $r->print('<td>'.         if ($output) { 
                   '<select name="weighttype_'.$id.'">'.            $r->print('<td>'.
                   '<option value="default"'.($categories{$id.'_weighttype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'.  
                   '<option value="typein"'.($categories{$id.'_weighttype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'.  
                   '</select>'.  
                   '<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 {      } else {
         $r->print('<td>'.($categories{$id.'_weighttype'} eq 'default'?&mt('default'):$categories{$id.'_weight'}).'</td>');         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 {
           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);
 }  }
   
 #  #
   # Drop folders and problems
   #
   
   sub drop {
       my ($high,$percent,$n,@individual)=@_;
   # Sort assignments by points or percent
       my @newindividual=sort {
           my ($pa,$ca)=split(/\:/,$a);
           my ($pb,$cb)=split(/\:/,$b);
           if ($percent) {
               my $perca=0;
               if ($pa>0) { $perca=$ca/$pa; }
               my $percb=0;
               if ($pb>0) { $percb=$cb/$pb; }
               $perca<=>$percb;
           } else {
               $ca<=>$cb;
           }
       } @individual;
   # Drop the ones we don't want
       if ($#newindividual>=$n) {
           if ($high) {
              splice(@newindividual,$#newindividual+1-$n,$n);
           } else {
              splice(@newindividual,0,$n);
           }
       } else {
           @newindividual=();
       }
   # Re-calculate how many points possible and achieved
       my $newpossible=0;
       my $newcorrect=0;
       for my $score (@newindividual) {
           my ($thispossible,$thiscorrect)=(split(/\:/,$score));
           $newpossible+=$thispossible;
           $newcorrect+=$thiscorrect;
       }
       return ($newpossible,$newcorrect,@newindividual);
   } 
   #
 # Bottom line with grades  # Bottom line with grades
 #  #
   
Line 593  sub bottom_line_category { Line 850  sub bottom_line_category {
     my ($r,$cangrade,$sum,$total)=@_;      my ($r,$cangrade,$sum,$total)=@_;
     $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="/adm/quickgrades?cmd=createnewcat&storechanges=1">'.&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 617  sub make_new_category { Line 874  sub make_new_category {
     if (defined($ordernum)) {      if (defined($ordernum)) {
         %categories=&move_category($id,$cangrade,$ordernum,%categories);          %categories=&move_category($id,$cangrade,$ordernum,%categories);
     }      }
     $categories{$id.'_weighttype'}='default';      $categories{$id.'_weight'}=0;
       $categories{$id.'_totaltype'}='default';
       $categories{$id.'_displayachieved'}='percent';
       return %categories;
   }
   
   
   # === Calculation Rule Editing
   
   sub category_rule_codes {
       return &Apache::lonlocal::texthash(
                   'droplowperc'  => 'Drop N lowest grade percentage problems/folders',
                   'drophighperc' => 'Drop N highest grade percentage problems/folderss',
                   'droplow'  => 'Drop N lowest point problems/folders',
                   'drophigh' => 'Drop N highest point problems/folders',
                   'capabove' => 'Cap percentage above 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">';
       if ($cangrade) {
           $ret.='<select name="sel_'.$cid.'">';
           foreach my $calc (''=>'',sort(keys(%lt))) {
               $ret.='<option value="'.$calc.'"'.($calc eq $code?' selected="selected"':'').' />'.$lt{$calc}.'</input>';
           }
           $ret.='</select> N=<input type="text" size="5" name="val_'.$cid.'" value="'.$value.'" /></span>';
       } else {
           $ret.=$lt{$code}.'; N='.$value;
       }
       $ret.='</span>';
       return $ret;
   }
   
   sub new_calc_rule_form {
       my ($id)=@_;
       return '<a href="javascript:storecmd(\'newrule_'.$id.'\');">'.&mt('New Calculation Rule').'</a>';
   }
   
   #
   # Add a calculation rule
   #
   
   sub add_calculation_rule {
       my ($id,$cangrade,$newcontent,%categories)=@_;
       unless ($cangrade) { return %categories; }
       my %newcontent=($newcontent => 1);
       foreach my $current (split(/\,/,$categories{$id.'_calculations'})) {
           $newcontent{$current}=1;
       }
       $categories{$id.'_calculations'}=join(',',sort(keys(%newcontent)));
       return %categories;
   }
   
   #
   # Delete a calculation rule
   #
   
   sub del_calculation_rule {
       my ($id,$cangrade,$delcontent,%categories)=@_;
       unless ($cangrade) { return %categories; }
       my @newcontent=();
       foreach my $current (split(/\,/,$categories{$id.'_calculations'})) {
           unless ($current=~/^\Q$delcontent\E\:/) {
               push(@newcontent,$current);
           }
       }
       $categories{$id.'_calculations'}=join(',',@newcontent);
       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
   
   #
   # Add to category content
   #
   
   sub add_category_content {
       my ($id,$cangrade,$newcontent,%categories)=@_;
       unless ($cangrade) { return %categories; }
       &Apache::lonnet::logthis("In here $newcontent");
       my %newcontent=($newcontent => 1);
       foreach my $current (split(/\,/,$categories{$id.'_content'})) {
           $newcontent{$current}=1;
       }
       $categories{$id.'_content'}=join(',',sort(keys(%newcontent)));
       return %categories;
   }
   
   #
   # Delete from category content
   #
   
   sub del_category_content {
       my ($id,$cangrade,$delcontent,%categories)=@_;
       unless ($cangrade) { return %categories; }
       my @newcontent=();
       foreach my $current (split(/\,/,$categories{$id.'_content'})) {
           unless ($current eq $delcontent) {
               push(@newcontent,$current);
           }
       }
       $categories{$id.'_content'}=join(',',@newcontent);
     return %categories;      return %categories;
 }  }
   
Line 626  sub make_new_category { Line 1003  sub make_new_category {
 #  #
   
 sub del_category {  sub del_category {
    my ($id,$cangrade,%categories)=@_;       my ($id,$cangrade,%categories)=@_;
    my @neworder=();      unless ($cangrade) { return %categories; }
    foreach my $currentid (split(/\,/,$categories{'order'})) {      my @neworder=();
       unless ($currentid eq $id) {      foreach my $currentid (split(/\,/,$categories{'order'})) {
          push(@neworder,$currentid);          unless ($currentid eq $id) {
       }              push(@neworder,$currentid);
    }          }
    $categories{'order'}=join(',',@neworder);      }
    return %categories;      $categories{'order'}=join(',',@neworder);
       return %categories;
   }
   
   #
   # Move category up
   #
   
   sub move_up_category {
       my ($id,$cangrade,%categories)=@_;
       my $currentpos=&current_pos_category($id,%categories);
       if ($currentpos<1) { return %categories; }
       return &move_category($id,$cangrade,$currentpos-1,%categories);
   }
   
   #
   # Move category down
   #
   
   sub move_down_category {
       my ($id,$cangrade,%categories)=@_;
       my $currentpos=&current_pos_category($id,%categories);
       my @order=split(/\,/,$categories{'order'});
       if ($currentpos>=$#order) { return %categories; }
       return &move_category($id,$cangrade,$currentpos+1,%categories);
 }  }
   
 #  #
Line 696  sub set_category_name { Line 1097  sub set_category_name {
 }  }
   
 #  #
 # Set weight of a category  # Set total of a category
 #  #
 sub set_category_weight {  sub set_category_total {
     my ($cangrade,$id,$weighttype,$weight,%categories)=@_;      my ($cangrade,$id,$totaltype,$total,%categories)=@_;
     unless ($cangrade) { return %categories; }      unless ($cangrade) { return %categories; }
     if (($categories{$id.'_weight'} eq '') && ($weight=~/\d/)) {      if (($categories{$id.'_total'} eq '') && ($total=~/\d/)) {
         $weighttype='typein';          $totaltype='typein';
     }      }
     $categories{$id.'_weighttype'}=$weighttype;      $categories{$id.'_totaltype'}=$totaltype;
     if ($weighttype eq 'default') {      if ($totaltype eq 'default') {
         $categories{$id.'_weight'}='';          $categories{$id.'_total'}='';
     } else {      } else {
         $weight=~s/\D//gs;          $total=~s/\D//gs;
         unless ($weight) { $weight=0; }          unless ($total) { $total=0; }
         $categories{$id.'_weight'}=$weight;          $categories{$id.'_total'}=$total;
     }      }
     return %categories;      return %categories;
 }  }
   
   sub set_category_weight {
       my ($cangrade,$id,$weight,%categories)=@_;
       unless ($cangrade) { return %categories; }
       $weight=~s/\D//gs;
       unless ($weight) { $weight=0; }
       $categories{$id.'_weight'}=$weight;
       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.70  
changed lines
  Added in v.1.94

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