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

Diff for /loncom/interface/lonquickgrades.pm between versions 1.84 and 1.88

version 1.84, 2011/05/03 23:51:19 version 1.88, 2011/05/22 21:53:52
Line 467  sub outputCategories { Line 467  sub outputCategories {
         $r->print(&Apache::loncommon::resourcebrowser_javascript().          $r->print(&Apache::loncommon::resourcebrowser_javascript().
                   '<input type="hidden" name="storemove" value="" />'.                    '<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>');
     }      }
Line 538  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\_(.+)$/) {
Line 568  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,%categories);
         $sum+=$value*$weight;          $sum+=$value*$weight;
         $total+=$weight;          $total+=$weight;
     }      }
Line 602  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,%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') . "/");
Line 645  ENDMOVE Line 647  ENDMOVE
     $r->print('<td><ul>');      $r->print('<td><ul>');
     foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {      foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
         $r->print('<li>');          $r->print('<li>');
         $r->print(&Apache::lonnet::gettitle($contentid));          $r->print(&Apache::lonnet::gettitle($contentid).' '.$$performance{$contentid});
         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 653  ENDMOVE Line 655  ENDMOVE
     }      }
     $r->print('</ul>');      $r->print('</ul>');
     if ($cangrade) {      if ($cangrade) {
         $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id.'_res',&mt('Add Problem or Folder')).'<br />'.          $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');
                   '<input type="hidden" name="addcont_'.$id.'_res" onChange='."'".'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'."' />");  
     }      }
     $r->print('</td>');       $r->print('</td>'); 
   
Line 844  sub set_category_rules { Line 845  sub set_category_rules {
 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;
Removed from v.1.84  
changed lines
  Added in v.1.88

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