Diff for /loncom/interface/lonquickgrades.pm between versions 1.74 and 1.75

version 1.74, 2011/03/11 02:39:53 version 1.75, 2011/03/12 02:58:44
Line 94  sub real_handler { Line 94  sub real_handler {
         if (($stdid) && ($udom)) {          if (($stdid) && ($udom)) {
             $uname=(&Apache::lonnet::idget($udom,$stdid))[1];              $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">');          $r->print('<form method="post" name="quickform" action="/adm/quickgrades">');
         my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.          my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
            &Apache::loncommon::selectstudent_link('quickform','uname','udom');             &Apache::loncommon::selectstudent_link('quickform','uname','udom');
Line 103  sub real_handler { Line 107  sub real_handler {
                  ,'<input type="text" value="'.$stdid.'" size="12" name="id" /> '                   ,'<input type="text" value="'.$stdid.'" size="12" name="id" /> '
                  ,$chooseopt).'<br />'.                   ,$chooseopt).'<br />'.
                  '<input type="submit" name="display" value="'.&mt('Update Display').'" /></p>');                   '<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();      $r->rflush();
   
Line 484  sub process_category_edits { Line 491  sub process_category_edits {
         %categories=&move_down_category($1,$cangrade,%categories);          %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);
       } elsif ($cmd=~/^addcont\_(.+)$/) {
           %categories=&add_category_content($1,$cangrade,$env{'form.addcont_'.$1.'_symb'},%categories);
       } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) {
           %categories=&del_category_content($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 580  ENDMOVE Line 591  ENDMOVE
         $r->print('<td>'.$categories{$id.'_name'}.'</td>');          $r->print('<td>'.$categories{$id.'_name'}.'</td>');
     }      }
 # Content  # Content
 # FIXME: just placeholders      $r->print('<td><ul>');
       foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
           $r->print('<li>');
           $r->print(&Apache::lonnet::gettitle($contentid));
           if ($cangrade) {
              $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
           }
           $r->print('</li>');
       }
       $r->print('</ul>');
     if ($cangrade) {      if ($cangrade) {
        $r->print("<td>Content Edit</td>");          $r->print('<br />'.&mt('Add Problem or Sequence').'<br />'.
     } else {                    &Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'));
        $r->print("<td>Content</td>");  
     }      }
       $r->print('</td>'); 
 # Calculation  # Calculation
 # FIXME: just placeholders  # FIXME: just placeholders
     if ($cangrade) {      if ($cangrade) {
Line 655  sub make_new_category { Line 675  sub make_new_category {
 }  }
   
 #  #
   # Add to category content
   #
   
   sub add_category_content {
       my ($id,$cangrade,$newcontent,%categories)=@_;
       unless ($cangrade) { return %categories; }
       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;
   }
   
   #
 # Delete category  # Delete 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;
 }  }
   
 #  #

Removed from v.1.74  
changed lines
  Added in v.1.75


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