--- loncom/interface/lonquickgrades.pm 2011/02/20 22:48:26 1.69
+++ loncom/interface/lonquickgrades.pm 2011/03/25 01:34:49 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.69 2011/02/20 22:48:26 www Exp $
+# $Id: lonquickgrades.pm,v 1.78 2011/03/25 01:34:49 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;
@@ -165,7 +191,7 @@ sub startGradeScreen {
sub endGradeScreen {
my ($r)=@_;
- $r->print('');
+ $r->print(''.&Apache::loncommon::end_page());
}
@@ -398,9 +424,7 @@ sub outputTable {
.&Apache::loncommon::end_data_table_row());
}
- $r->print(&Apache::loncommon::end_data_table()
- .&Apache::loncommon::end_page());
-
+ $r->print(&Apache::loncommon::end_data_table());
}
#
@@ -425,24 +449,20 @@ sub outputCategories {
# Loading old categories
%categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
# 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
%categories=&process_category_edits($r,$cangrade,%categories);
# Actually store
- &Apache::lonnet::logthis("Storing ".$categories{'order'});
&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('');
+ ''.
+ ''.
+ '');
}
}
@@ -453,18 +473,36 @@ sub outputCategories {
sub process_category_edits {
my ($r,$cangrade,%categories)=@_;
unless ($cangrade) { return %categories; }
+# First store everything
+ foreach my $id (split(/\,/,$categories{'order'})) {
+ %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);
+# More changes here
+ }
+
+# Now deal with commands
my $cmd=$env{'form.cmd'};
if ($cmd eq 'createnewcat') {
%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\_(.+)$/) {
%categories=&del_category($1,$cangrade,%categories);
- } else {
-# Simply store the rest of the stuff
- foreach my $id (split(/\,/,$categories{'order'})) {
- %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories);
-# More changes here
- }
- }
+ } 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);
+ } elsif ($cmd=~/^newrule\_(.+)$/) {
+ %categories=&add_calculation_rule($1,$cangrade,':',%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;
}
@@ -504,8 +542,8 @@ sub output_category_table_header {
$r->print(''.&mt('Category').' | '.
''.&mt('Contents').' | '.
''.&mt('Calculation').' | '.
- ''.&mt('Weight').' | '.
- ''.&mt('Percent Overall').' | ');
+ ''.&mt('Total Points').' | '.
+ ''.&mt('Relative Weight').' | ');
$r->print(&Apache::loncommon::end_data_table_header_row());
}
@@ -528,12 +566,12 @@ sub output_and_calc_category {
$r->print(<
-
+
-
+
@@ -548,13 +586,67 @@ ENDMOVE
}
}
$r->print("\n\n\n");
- $r->print(''.&mt('Delete').' | ');
+ $r->print(''.&mt('Delete').' | ');
$r->print(' | ');
} else {
$r->print(''.$categories{$id.'_name'}.' | ');
}
- $r->print(&Apache::loncommon::end_data_table_row()."\n");
+# Content
+ $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(' '.&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
+ $r->print('');
+ foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
+ $r->print('- ');
+ my ($code,$value)=split(/\:/,$calcrule);
+ $r->print(&pretty_prt_rule($cangrade,$id,$code,$value));
+ if ($cangrade) {
+ $r->print(' '.&mt('Delete').'');
+ }
+ $r->print('
');
+ }
+ $r->print(' ');
+ if ($cangrade) {
+ $r->print(' '.&new_calc_rule_form($id));
+ }
+ $r->print(' | ');
+
+
+# Total
+ if ($cangrade) {
+ $r->print(''.
+ ''.
+ ' | ');
+ } else {
+ $r->print(''.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).' | ');
+ }
+# Weight
+ if ($cangrade) {
+ $r->print(''.
+ ' | ');
+ } else {
+ $r->print(''.$categories{$id.'_weight'}.' | ');
+ }
+
return ($value,$weight);
}
@@ -566,7 +658,7 @@ sub bottom_line_category {
my ($r,$cangrade,$sum,$total)=@_;
$r->print(&Apache::loncommon::start_data_table_row());
if ($cangrade) {
- $r->print(''.&mt('Create New Category').' | ');
+ $r->print(''.&mt('Create New Category').' | ');
}
$r->print(''.&mt('Current:').$sum.' '.&mt('Total:').$total.'
| ');
}
@@ -590,6 +682,104 @@ sub make_new_category {
if (defined($ordernum)) {
%categories=&move_category($id,$cangrade,$ordernum,%categories);
}
+ $categories{$id.'_weight'}=0;
+ $categories{$id.'_totaltype'}='default';
+ return %categories;
+}
+
+
+# === Calculation Rule Editing
+
+sub pretty_prt_rule {
+ my ($cangrade,$id,$code,$value)=@_;
+ my $cid=$id.'_'.$code;
+ my %lt=&Apache::lonlocal::texthash(
+ 'droplow' => 'Drop N lowest grade assignments',
+ 'drophigh' => 'Drop N highest grade assignments',
+ 'capabove' => 'Cap percentage above N percent',
+ 'capbelow' => 'Cap percentage below N percent');
+ my $ret='';
+ if ($cangrade) {
+ $ret.=' N=';
+ } else {
+ $ret.=$lt{$code}.'; N='.$value;
+ }
+ $ret.='';
+ return $ret;
+}
+
+sub new_calc_rule_form {
+ my ($id)=@_;
+ return ''.&mt('New Calculation Rule').'';
+}
+
+#
+# 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;
+}
+
+# === Category Editing
+
+#
+# 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;
}
@@ -598,15 +788,39 @@ sub make_new_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;
+}
+
+#
+# Move category up
+#
+
+sub move_up_category {
+ my ($id,$cangrade,%categories)=@_;
+ my $currentpos=¤t_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=¤t_pos_category($id,%categories);
+ my @order=split(/\,/,$categories{'order'});
+ if ($currentpos>=$#order) { return %categories; }
+ return &move_category($id,$cangrade,$currentpos+1,%categories);
}
#
@@ -667,6 +881,35 @@ sub set_category_name {
return %categories;
}
+#
+# Set total of a category
+#
+sub set_category_total {
+ my ($cangrade,$id,$totaltype,$total,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ if (($categories{$id.'_total'} eq '') && ($total=~/\d/)) {
+ $totaltype='typein';
+ }
+ $categories{$id.'_totaltype'}=$totaltype;
+ if ($totaltype eq 'default') {
+ $categories{$id.'_total'}='';
+ } else {
+ $total=~s/\D//gs;
+ unless ($total) { $total=0; }
+ $categories{$id.'_total'}=$total;
+ }
+ 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;
+}
+
#
# === end category-related
#