[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonquickgrades.pm
raeburn
raeburn at source.lon-capa.org
Tue Sep 1 10:38:07 EDT 2020
raeburn Tue Sep 1 14:38:07 2020 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonquickgrades.pm
Log:
- For 2.11
- Individual Points Overview in course available for user with vgr priv.
to display student's view of grades for selected student.
- Backport 1.51, 1.52, 1.53 (part), 1.54, 1.55 (part), 1.56 (part), 1.60,
1.61, 1.74 (part), 1.75 (part), 1.97, 1.98 (part), 1.118, 1.119
-------------- next part --------------
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.49.6.5 loncom/interface/lonquickgrades.pm:1.49.6.6
--- loncom/interface/lonquickgrades.pm:1.49.6.5 Sat Dec 1 16:38:06 2018
+++ loncom/interface/lonquickgrades.pm Tue Sep 1 14:38:07 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.49.6.5 2018/12/01 16:38:06 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.6 2020/09/01 14:38:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -58,12 +58,13 @@
return OK;
}
+ my $cangrade=&Apache::lonnet::allowed('mgr');
my $showPoints =
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
my $reinitresult;
- unless (&Apache::lonnet::allowed('mgr')) {
+ unless ($cangrade) {
# Check for critical messages and redirect if present.
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
if ($redirect) {
@@ -126,45 +127,89 @@
}
$r->rflush();
- my $notshowSPRSlink =
- (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
- || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
+ &startGradeScreen($r);
+
+#
+# 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],'ids'))[1];
+ }
+ if (($stdid) && (!$uname)) {
+ $r->print('<p><span class="LC_warning">'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'</span></p>');
+ $stdid='';
+ }
+ if (($uname eq '') && ($udom eq '')) {
+ $uname = $env{'user.name'};
+ $udom = $env{'user.domain'};
+ }
+ $r->print('<form method="post" name="quickform" action="/adm/quickgrades">');
+ my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
+ &Apache::loncommon::selectstudent_link('quickform','uname','udom');
+ $r->print("<p>\n".&Apache::loncommon::studentbrowser_javascript()."\n");
+ $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+ ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
+ ,'<input type="text" value="'.$stdid.'" size="12" name="id" /> '
+ ,$chooseopt).
+ ' <input type="submit" name="display" value="'.&mt('Display Individual Student').'" /></p>');
+ if (($uname) && ($udom)) {
+ $r->print('<p>'.&mt('Full Name: [_1]',&Apache::loncommon::plainname($uname,$udom)).'</p>');
+ }
+ } else {
+ $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
+ }
+ $r->rflush();
+
my $notshowTotals=
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
- # Create the nav map
- my $navmap = Apache::lonnavmaps::navmap->new();
+ my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,
+ $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);
- if (!defined($navmap)) {
+ if (ref($navmap)) {
+ &outputTable($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,
+ $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,
+ $topLevelAttempted);
+ } else {
+ if ($cangrade) { $r->print("\n</form>\n"); }
my $requrl = $r->uri;
- $env{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
+ $env{'user.error.msg'} = "$requrl:bre:0:0:Navmap initialization failed.";
return HTTP_NOT_ACCEPTABLE;
}
+ if ($cangrade) { $r->print("\n</form>\n"); }
+ &endGradeScreen($r);
+ return OK;
+}
- # Keep this hash in sync with %statusIconMap in lonnavmaps; they
- # should match color/icon
- my $res = $navmap->firstResource(); # temp resource to access constants
-
- if (!$showPoints && !$notshowSPRSlink ) {
- $r->print('<p>'
- .&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].'
- ,'<a href="/adm/studentcalc">','</a>')
- .'</p>');
- }
+#
+# Go through the complete course and collect data
+#
- $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
+sub getData {
- $r->rflush();
+ my ($showPoints,$uname,$udom)=@_;
- # End navmap using boilerplate
+ # Create the nav map
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+
+ if (!defined($navmap)) {
+ return ();
+ }
+
+ my $res = $navmap->firstResource(); # temp resource to access constants
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $depth = 1;
$iterator->next(); # ignore first BEGIN_MAP
my $curRes = $iterator->next();
-
+
# General overview of the following: Walk along the course resources.
# For every problem in the resource, tell its parent maps how many
# parts and how many parts correct it has. After that, each map will
@@ -197,35 +242,36 @@
my $stack = $iterator->getStack();
for my $part (@{$parts}) {
- my $completionStatus = $curRes->getCompletionStatus($part);
my $dateStatus = $curRes->getDateStatus($part);
-
- if ($completionStatus == $curRes->EXCUSED()) {
+ my $weight = $curRes->weight($part);
+ my $problemstatus = $curRes->problemstatus($part);
+
+ if ($curRes->solved($part) eq 'excused') {
next;
}
if ($showPoints) {
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') ||
- ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
+ if ((($problemstatus eq 'no') ||
+ ($problemstatus eq 'no_feedback_ever')) &&
($dateStatus != $curRes->ANSWER_OPEN)) {
my $status = $curRes->simpleStatus($part);
if ($status == $curRes->ATTEMPTED) {
- $partsAttempted += $curRes->weight($part);
+ $partsAttempted += $weight;
$totalAttempted += $partsAttempted;
}
} else {
- $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
+ $score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
}
$partsRight += $score;
$totalRight += $score;
- $partsCount += $curRes->weight($part);
+ $partsCount += $weight;
if ($curRes->opendate($part) < $now) {
- $totalPossible += $curRes->weight($part);
+ $totalPossible += $weight;
}
- $totalParts += $curRes->weight($part);
+ $totalParts += $weight;
} else {
my $status = $curRes->simpleStatus($part);
my $thisright = 0;
@@ -242,7 +288,6 @@
$totalAttempted++;
}
- my $dateStatus = $curRes->getDateStatus($part);
$totalParts++;
if ($curRes->opendate($part) < $now) {
$totalPossible++;
@@ -273,11 +318,18 @@
}
$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);
@@ -290,10 +342,19 @@
.'<th>'.&mt('Folder').'</th>');
my $title = &mt($showPoints ? "Points Scored" : "Done");
if ($totalAttempted) {
- $title .= " / " . &mt("Attempted");
+ $title .= " / " . &mt("Attempted");
}
$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--; }
@@ -349,6 +410,9 @@
.&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");
@@ -362,10 +426,8 @@
.&Apache::loncommon::end_data_table_row());
}
- $r->print(&Apache::loncommon::end_data_table()
- .&Apache::loncommon::end_page());
-
- return OK;
+ $r->print(&Apache::loncommon::end_data_table());
+ return;
}
sub startpage {
@@ -377,6 +439,57 @@
);
}
+sub startGradeScreen {
+ my ($r)=@_;
+
+ 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'));
+ my $notshowTotals =
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+ my $showSPRSlink =
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet';
+
+ my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+ if ((!$allowed_to_view) && ($env{'request.course.sec'} ne '')) {
+ $allowed_to_view = &Apache::lonnet::allowed('vgr',
+ "$env{'request.course.id'}/$env{'request.course.sec'}");
+ }
+
+ my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+ if ((!$allowed_to_edit) && ($env{'request.course.sec'} ne '')) {
+ $allowed_to_edit = &Apache::lonnet::allowed('mgr',
+ "$env{'request.course.id'}/$env{'request.course.sec'}");
+ }
+
+ 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 link to spreadsheet.')) if ($showSPRSlink);
+ push(@notes,&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
+ $r->print(&Apache::loncommon::head_subbox(join(' ', at notes)));
+ } elsif (!$allowed_to_edit) {
+ if (!$showPoints && !$notshowSPRSlink ) {
+ $r->print(&Apache::loncommon::head_subbox(
+ &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].'
+ ,'<a href="/adm/studentcalc">','</a>')));
+ }
+ }
+ return;
+}
+
+sub endGradeScreen {
+ my ($r)=@_;
+ $r->print(&Apache::loncommon::end_page());
+ return;
+}
+
# 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");
More information about the LON-CAPA-cvs
mailing list