--- loncom/interface/lonquickgrades.pm 2011/03/09 01:46:08 1.73
+++ loncom/interface/lonquickgrades.pm 2011/03/12 02:58:44 1.75
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.73 2011/03/09 01:46:08 www Exp $
+# $Id: lonquickgrades.pm,v 1.75 2011/03/12 02:58:44 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,13 +80,38 @@ sub real_handler {
&startGradeScreen($r,'quick');
- $r->rflush();
-
-# my $uname='korte';
-# my $udom='gerd';
-
+ my $cangrade=&Apache::lonnet::allowed('mgr');
+#
+# Pick student
+#
my $uname;
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('
'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'
');
+ $stdid='';
+ }
+ $r->print('\n"); }
&endGradeScreen($r);
return OK;
@@ -430,19 +456,13 @@ sub outputCategories {
&Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
}
# new categories loaded now
-# Form only generated if user can change the grading categories
- if ($cangrade) {
- $r->print('');
+ '');
}
}
@@ -471,6 +491,10 @@ sub process_category_edits {
%categories=&move_down_category($1,$cangrade,%categories);
} elsif ($cmd=~/^delcat\_(.+)$/) {
%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
my $moveid=$env{'form.storemove'};
@@ -567,12 +591,21 @@ ENDMOVE
$r->print(''.$categories{$id.'_name'}.' | ');
}
# Content
-# FIXME: just placeholders
+ $r->print('');
+ foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
+ $r->print('- ');
+ $r->print(&Apache::lonnet::gettitle($contentid));
+ if ($cangrade) {
+ $r->print(' '.&mt('Delete').'');
+ }
+ $r->print('
');
+ }
+ $r->print(' ');
if ($cangrade) {
- $r->print(" | Content Edit | ");
- } else {
- $r->print("Content | ");
+ $r->print('
'.&mt('Add Problem or Sequence').'
'.
+ &Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'));
}
+ $r->print('');
# Calculation
# FIXME: just placeholders
if ($cangrade) {
@@ -642,19 +675,52 @@ 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
#
sub del_category {
- my ($id,$cangrade,%categories)=@_;
- my @neworder=();
- foreach my $currentid (split(/\,/,$categories{'order'})) {
- unless ($currentid eq $id) {
- push(@neworder,$currentid);
- }
- }
- $categories{'order'}=join(',',@neworder);
- return %categories;
+ my ($id,$cangrade,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ my @neworder=();
+ foreach my $currentid (split(/\,/,$categories{'order'})) {
+ unless ($currentid eq $id) {
+ push(@neworder,$currentid);
+ }
+ }
+ $categories{'order'}=join(',',@neworder);
+ return %categories;
}
#