--- loncom/interface/lonquickgrades.pm 2005/04/07 06:56:23 1.36
+++ loncom/interface/lonquickgrades.pm 2010/12/03 22:00:28 1.56
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.36 2005/04/07 06:56:23 albertel Exp $
+# $Id: lonquickgrades.pm,v 1.56 2010/12/03 22:00:28 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,7 +25,6 @@
#
# http://www.lon-capa.org/
#
-# Created Nov. 14, 2002 by Jeremy Bowers
package Apache::lonquickgrades;
@@ -35,6 +34,7 @@ use POSIX;
use Apache::loncommon;
use Apache::lonlocal;
use Apache::lonnet;
+use Apache::grades;
sub handler {
my $r = shift;
@@ -47,60 +47,117 @@ sub real_handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
# Handle header-only request
+ if ($env{'browser.mathml'}) {
+ &Apache::loncommon::content_type($r,'text/xml');
+ } else {
+ &Apache::loncommon::content_type($r,'text/html');
+ }
if ($r->header_only) {
- if ($env{'browser.mathml'}) {
- &Apache::loncommon::content_type($r,'text/xml');
- } else {
- &Apache::loncommon::content_type($r,'text/html');
- }
- $r->send_http_header;
+ $r->send_http_header;
return OK;
}
# Send header, don't cache this page
- if ($env{'browser.mathml'}) {
- &Apache::loncommon::content_type($r, 'text/xml');
- } else {
- &Apache::loncommon::content_type($r, 'text/html');
- }
&Apache::loncommon::no_cache($r);
$r->send_http_header;
- my $showPoints =
+ my $showPoints =
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
- my $notshowSPRSlink =
- $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external';
+ my $notshowSPRSlink =
+ (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
+ || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
+ my $notshowTotals=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+ my $showCategories=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+
+
+ 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})
+ );
- # Create the nav map
- my $navmap = Apache::lonnavmaps::navmap->new();
+ &startGradeScreen($r,'quick');
+
+ $r->rflush();
+
+# 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;
- if (!defined($navmap)) {
- my $requrl = $r->uri;
- $env{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
- return HTTP_NOT_ACCEPTABLE;
+}
+
+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) {
+ $r->print('<div id="LC_head_subbox">');
+ if ($notshowTotals) { $r->print (' '.&mt('Students do not see total points.').' '); }
+ if ($notshowSPRSlink){ $r->print (' '.&mt('Students do not see link to spreadsheet.').' '); }
+ if ($showPoints) { $r->print (' '.&mt('Students will see points based on problem weights.').' '); }
+ if ($showCategories) { $r->print (' '.&mt('Students will see points based on categories.').' '); }
+ $r->print(' '.&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading').'</div>');
}
- # Keep this hash in sync with %statusIconMap in lonnavmaps; they
- # should match color/icon
- my $res = $navmap->firstResource(); # temp resource to access constants
-
- # Header
- my $title = $showPoints ? "Points Display" : "Completed Problems Display";
- $r->print(&Apache::loncommon::bodytag($title, '', ''));
-
- if (!$showPoints && !$notshowSPRSlink ) {
- $r->print(<<HEADER);
-<p>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 <a href="/adm/studentcalc">a detailed
-score sheet</a>.</p>
-HEADER
+
+ $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
+ $r->print("\n".'<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b>'.
+ ($showPoints?&mt('Points'):($showCategories?&mt('Grades'):&mt('Completion'))).'</b></a></li>');
+
+ if (!($showPoints || $notshowSPRSlink) || ($allowed_to_view)) {
+ $r->print("\n".'<li'.($mode eq 'spreadsheet'?' class="active"':'').'><a href="/adm/'.($allowed_to_view?'classcalc':'studentcalc').'"><b>'.
+ &mt('Spreadsheet').'</b></a></li>');
}
+ $r->print("\n".'</ul>'."\n");
+ $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+}
- $r->print("This may take a few moments to display.");
+sub endGradeScreen {
+ my ($r)=@_;
+ $r->print('</div></div></div>');
+}
- $r->rflush();
- # End navmap using boilerplate
+sub getData {
+
+ my ($showPoints,$uname,$udom)=@_;
+
+ &Apache::lonnet::logthis("About to call with $uname $udom");
+
+ # Create the nav map
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+
+ my $res = $navmap->firstResource(); # temp resource to access constants
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $depth = 1;
@@ -149,7 +206,8 @@ HEADER
my $score = 0;
# If we're not telling status and the answer date isn't passed yet,
# it's an "attempted" point
- if ($curRes->problemstatus($part) eq 'no' &&
+ if ((($curRes->problemstatus($part) eq 'no') ||
+ ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
($dateStatus != $curRes->ANSWER_OPEN)) {
my $status = $curRes->simpleStatus($part);
if ($status == $curRes->ATTEMPTED) {
@@ -157,7 +215,7 @@ HEADER
$totalAttempted += $partsAttempted;
}
} else {
- $score = $curRes->weight($part) * $curRes->awarded($part);
+ $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
}
$partsRight += $score;
$totalRight += $score;
@@ -171,7 +229,8 @@ HEADER
my $status = $curRes->simpleStatus($part);
my $thisright = 0;
$partsCount++;
- if ($status == $curRes->CORRECT ) {
+ if ($status == $curRes->CORRECT ||
+ $status == $curRes->PARTIALLY_CORRECT ) {
$partsRight++;
$totalRight++;
$thisright = 1;
@@ -213,11 +272,17 @@ HEADER
}
$curRes = $iterator->next();
}
+ return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+}
- $iterator = $navmap->getIterator(undef, undef, undef, 1);
- $depth = 1;
- $iterator->next(); # ignore first BEGIN_MAP
- $curRes = $iterator->next();
+#
+# Outputting everything.
+#
+
+sub outputTable {
+
+ my ($r,$showPoints,$notshowTotals,
+ $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
my @start = (255, 255, 192);
my @end = (0, 192, 0);
@@ -225,14 +290,24 @@ HEADER
my $indentString = ' ';
# Second pass: Print the maps.
- $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>' .
- &mt('Folder') . '</b></td>');
- $title = &mt($showPoints ? "Points Scored" : "Done");
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Folder').'</th>');
+ my $title = &mt($showPoints ? "Points Scored" : "Done");
if ($totalAttempted) {
- $title .= " / " . &mt("Attempted");
+ $title .= " / " . &mt("Attempted");
}
- $r->print("<td align='center'>$title / "
- . &mt('Total') . "</td><tr>\n\n");
+ $r->print("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
+ .&Apache::loncommon::end_data_table_header_row());
+#
+# Output of folder scores
+#
+
+ my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+ my $depth = 1;
+ $iterator->next(); # ignore first BEGIN_MAP
+ my $curRes = $iterator->next();
+
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -247,17 +322,29 @@ HEADER
if ($total > 0) {
my $ratio;
$ratio = $correct / $total;
- my $color = mixColors(\@start, \@end, $ratio);
- $r->print("<tr><td bgcolor='$color'>");
+ my $color = &mixColors(\@start, \@end, $ratio);
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td style="background-color:'.$color.';">');
my $thisIndent = '';
for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
$r->print("$thisIndent$title</td>");
if ($totalAttempted) {
- $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td></tr>\n");
+ $r->print('<td valign="top">'
+ .$thisIndent
+ .'<span class="LC_nobreak">'
+ .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
+ .'</span></td>'
+ .&Apache::loncommon::end_data_table_row()
+ );
} else {
- $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+ $r->print('<td valign="top">'
+ .$thisIndent
+ .'<span class="LC_nobreak">'
+ .$correct.($notshowTotals?'':' / '.$total)
+ .'</span></td>'
+ .&Apache::loncommon::end_data_table_row());
}
}
}
@@ -269,30 +356,48 @@ HEADER
if ($topLevelParts > 0) {
my $ratio = $topLevelRight / $topLevelParts;
my $color = mixColors(\@start, \@end, $ratio);
- $r->print("<tr><td bgcolor='$color'>");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td style="background-color:'.$color.';">');
$r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
- $r->print("$topLevelRight / $topLevelParts</td></tr>");
+ $r->print("$topLevelRight / $topLevelParts</td>"
+ .&Apache::loncommon::end_data_table_row());
}
+#
+# 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";
-
- $r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");
- $r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");
- $title = $showPoints ? "Points" : "Parts";
- $r->print(&mt("Total $title In Course").": <b>$totalParts</b></td></tr>\n\n");
+ $title = $showPoints ? "Points" : "Parts Done";
+ my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td colspan="2" align="right">'.$totaltitle.': <b>'.$totalRight.'</b><br />');
+ $r->print(&mt('Max Possible To Date')." $maxHelpLink: <b>$totalPossible</b><br />");
+ $title = $showPoints ? "Points" : "Parts";
+ $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>'
+ .&Apache::loncommon::end_data_table_row());
}
- $r->print("</table></body></html>");
+ $r->print(&Apache::loncommon::end_data_table()
+ .&Apache::loncommon::end_page());
- return OK;
+}
+
+#
+# Outputting category-based grades.
+#
+
+sub outputCategories {
+
+ my ($r,$showPoints,$notshowTotals,
+ $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
}
# 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");
+
sub mixColors {
my $start = shift;
my $end = shift;