--- loncom/interface/lonquickgrades.pm 2010/11/29 22:37:26 1.51
+++ loncom/interface/lonquickgrades.pm 2011/02/20 23:38:00 1.70
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.51 2010/11/29 22:37:26 www Exp $
+# $Id: lonquickgrades.pm,v 1.70 2011/02/20 23:38:00 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,9 +61,9 @@ sub real_handler {
&Apache::loncommon::no_cache($r);
$r->send_http_header;
- my $showPoints =
+ my $showPoints =
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
- my $notshowSPRSlink =
+ my $notshowSPRSlink =
(($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
|| ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
my $notshowTotals=
@@ -72,38 +72,109 @@ sub real_handler {
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
- # Header
my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
$r->print(&Apache::loncommon::start_page($title,undef,
{'bread_crumbs' => $brcrum})
);
- if (!$showPoints && !$notshowSPRSlink ) {
- $r->print('
'
- .&mt('This screen shows how many problems (or problem parts) you have completed'
- .', and how many you have not yet done.'
- .' You can also look at [_1]a detailed score sheet[_2].'
- ,'','')
- .'
');
- }
-
- $r->print('
'.&mt('This may take a few moments to display.').'
');
+ &startGradeScreen($r,'quick');
$r->rflush();
- my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=&getData($showPoints);
- &outputTable($r,$showPoints,$notshowTotals,
+
+# my $uname='korte';
+# my $udom='gerd';
+
+ my $uname;
+ my $udom;
+
+ my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
+ &getData($showPoints,$uname,$udom);
+
+ if ($showCategories) {
+ &outputCategories($r,$showPoints,$notshowTotals,
+ $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+ } else {
+ &outputTable($r,$showPoints,$notshowTotals,
$navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+ }
+ &endGradeScreen($r);
return OK;
}
+sub startGradeScreen {
+ my ($r,$mode)=@_;
+
+ my $showPoints =
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+ my $notshowSPRSlink =
+ (($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 'categories'));
+ my $notshowTotals=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+ my $showCategories=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+
+ my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+ my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+
+ if ($allowed_to_view) {
+ my @notes;
+ push(@notes,&mt('Students do not see total points.')) if ($notshowTotals);
+ push(@notes,&mt('Students do not see link to spreadsheet.')) if ($notshowSPRSlink);
+ push(@notes,&mt('Students will see points based on problem weights.')) if ($showPoints);
+ push(@notes,&mt('Students will see points based on categories.')) if ($showCategories);
+ push(@notes, &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
+ $r->print(&Apache::loncommon::head_subbox(join(' ',@notes)));
+ }
+
+
+ $r->print("\n".'
');
+}
+
+
sub getData {
- my ($showPoints)=@_;
+ my ($showPoints,$uname,$udom)=@_;
# Create the nav map
- my $navmap = Apache::lonnavmaps::navmap->new();
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
my $res = $navmap->firstResource(); # temp resource to access constants
@@ -303,7 +374,7 @@ sub outputTable {
# If there were any problems at the top level, print an extra "catchall"
if ($topLevelParts > 0) {
my $ratio = $topLevelRight / $topLevelParts;
- my $color = mixColors(\@start, \@end, $ratio);
+ my $color = &mixColors(\@start, \@end, $ratio);
$r->print(&Apache::loncommon::start_data_table_row()
.'
');
$r->print(&mt("Problems Not Contained In A Folder")."
");
@@ -315,7 +386,7 @@ sub outputTable {
# show totals (if applicable), close table
#
if ($showPoints) {
- my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+ my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
$title = $showPoints ? "Points" : "Parts Done";
my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
@@ -332,6 +403,323 @@ sub outputTable {
}
+#
+# === Outputting category-based grades.
+#
+# $category{'order'}: output order of categories by id
+# $category{'all'}: complete list of all categories
+# $category{$id.'_name'}: display-name of category
+#
+
+sub outputCategories {
+
+ my ($r,$showPoints,$notshowTotals,
+ $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+# Take care of storing and retrieving categories
+
+ my $cangrade=&Apache::lonnet::allowed('mgr');
+
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my %categories=();
+# Loading old categories
+ %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
+# Storing
+ if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} 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('');
+ }
+}
+
+#
+# Process editing commands, update category hash
+#
+
+sub process_category_edits {
+ my ($r,$cangrade,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ my $cmd=$env{'form.cmd'};
+ if ($cmd eq 'createnewcat') {
+ %categories=&make_new_category($r,$cangrade,undef,%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);
+ %categories=&set_category_weight($cangrade,$id,$env{'form.weighttype_'.$id},$env{'form.weight_'.$id},%categories);
+# More changes here
+ }
+ }
+ return %categories;
+}
+
+#
+# Output the table
+#
+
+sub output_category_table {
+ my ($r,$cangrade,$navmaps,%categories)=@_;
+ my $sum=0;
+ my $total=0;
+ $r->print(&Apache::loncommon::start_data_table());
+#
+ &output_category_table_header($r,$cangrade);
+#
+ my @order=split(/\,/,$categories{'order'});
+#
+ my $maxpos=$#order;
+ for (my $i=0;$i<=$maxpos;$i++) {
+ my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,%categories);
+ $sum+=$value*$weight;
+ $total+=$weight;
+ }
+#
+ &bottom_line_category($r,$cangrade,$sum,$total);
+#
+ $r->print(&Apache::loncommon::end_data_table());
+ return $sum;
+}
+
+sub output_category_table_header {
+ my ($r,$cangrade)=@_;
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ if ($cangrade) {
+ $r->print('
'.&mt("Move").'
'.&mt('Action').'
');
+ }
+ $r->print('
'.&mt('Category').'
'.
+ '
'.&mt('Contents').'
'.
+ '
'.&mt('Calculation').'
'.
+ '
'.&mt('Weight').'
'.
+ '
'.&mt('Percent Overall').'
');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+}
+
+
+#
+# Output one category to table
+#
+
+sub output_and_calc_category {
+ my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,%categories)=@_;
+ my $value=0;
+ my $weight=0;
+ my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
+ my %lt=&Apache::lonlocal::texthash(
+ 'up' => 'Move Up',
+ 'dw' => 'Move Down');
+ $r->print("\n".&Apache::loncommon::start_data_table_row());
+
+ if ($cangrade) {
+ $r->print(<
+
');
+}
+
+#
+# Make one new category
+#
+
+sub make_new_category {
+ my ($r,$cangrade,$ordernum,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+# Generate new ID
+ my $id=time.'_'.$$.'_'.rand(10000);
+# Add new ID to list of all IDs ever created in this course
+ $categories{'all'}.=','.$id;
+ $categories{'all'}=~s/^\,//;
+# Add new ID to ordered list of displayed and evaluated categories
+ $categories{'order'}.=','.$id;
+ $categories{'order'}=~s/^\,//;
+# Move it into desired space
+ if (defined($ordernum)) {
+ %categories=&move_category($id,$cangrade,$ordernum,%categories);
+ }
+ $categories{$id.'_weighttype'}='default';
+ 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;
+}
+
+#
+# Move a category to a desired position n the display order
+#
+
+sub move_category {
+ my ($id,$cangrade,$ordernum,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ my @order=split(/\,/,$categories{'order'});
+# Where is the index currently?
+ my $currentpos=¤t_pos_category($id,%categories);
+ if (defined($currentpos)) {
+ if ($currentpos<$ordernum) {
+# This is moving to a higher index
+# ....X1234....
+# ....1234X....
+ for (my $i=$currentpos;$i<$ordernum;$i++) {
+ $order[$i]=$order[$i+1];
+ }
+ $order[$ordernum]=$id;
+ }
+ if ($currentpos>$ordernum) {
+# This is moving to a lower index
+# ....1234X....
+# ....X1234....
+ for (my $i=$currentpos;$i>$ordernum;$i--) {
+ $order[$i]=$order[$i-1];
+ }
+ $order[$ordernum]=$id;
+ }
+ }
+ $categories{'order'}=join(',',@order);
+ return %categories;
+}
+
+#
+# Find current postion of a category in the order
+#
+
+sub current_pos_category {
+ my ($id,%categories)=@_;
+ my @order=split(/\,/,$categories{'order'});
+ for (my $i=0;$i<=$#order;$i++) {
+ if ($order[$i] eq $id) { return $i; }
+ }
+# not found
+ return undef;
+}
+
+#
+# Set name of a category
+#
+sub set_category_name {
+ my ($cangrade,$id,$name,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ $categories{$id.'_name'}=$name;
+ return %categories;
+}
+
+#
+# Set weight of a category
+#
+sub set_category_weight {
+ my ($cangrade,$id,$weighttype,$weight,%categories)=@_;
+ unless ($cangrade) { return %categories; }
+ if (($categories{$id.'_weight'} eq '') && ($weight=~/\d/)) {
+ $weighttype='typein';
+ }
+ $categories{$id.'_weighttype'}=$weighttype;
+ if ($weighttype eq 'default') {
+ $categories{$id.'_weight'}='';
+ } else {
+ $weight=~s/\D//gs;
+ unless ($weight) { $weight=0; }
+ $categories{$id.'_weight'}=$weight;
+ }
+ return %categories;
+}
+
+
+#
+# === end category-related
+#
+#
# Pass this two refs to arrays for the start and end color, and a number
# from 0 to 1 for how much of the latter you want to mix in. It will
# return a string ready to show ("#FFC309");
+
+
+
+