version 1.16, 2003/06/23 20:01:20
|
version 1.94, 2011/05/27 19:32:10
|
Line 1
|
Line 1
|
# The LearningOnline Network with CAPA |
# The LearningOnline Network with CAPA |
# Quick Student Grades Display |
# Quick Student Grades Display |
# |
# |
# |
# $Id$ |
# |
# |
# Copyright Michigan State University Board of Trustees |
# Copyright Michigan State University Board of Trustees |
# |
# |
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# Created Nov. 14, 2002 by Jeremy Bowers |
|
|
|
package Apache::lonquickgrades; |
package Apache::lonquickgrades; |
|
|
use strict; |
use strict; |
use Apache::Constants qw(:common :http); |
use Apache::Constants qw(:common :http); |
use POSIX; |
use POSIX; |
|
use Apache::loncommon; |
|
use Apache::lonlocal; |
|
use Apache::lonnet; |
|
use Apache::grades; |
|
|
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
Line 44 sub real_handler {
|
Line 47 sub real_handler {
|
&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING}); |
|
|
# Handle header-only request |
# 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 ($r->header_only) { |
if ($ENV{'browser.mathml'}) { |
$r->send_http_header; |
$r->content_type('text/xml'); |
|
} else { |
|
$r->content_type('text/html'); |
|
} |
|
$r->send_http_header; |
|
return OK; |
return OK; |
} |
} |
|
|
# Send header, don't cache this page |
# Send header, don't cache this page |
if ($ENV{'browser.mathml'}) { |
|
$r->content_type('text/xml'); |
|
} else { |
|
$r->content_type('text/html'); |
|
} |
|
&Apache::loncommon::no_cache($r); |
&Apache::loncommon::no_cache($r); |
$r->send_http_header; |
$r->send_http_header; |
|
|
# Create the nav map |
my $showPoints = |
my $navmap = Apache::lonnavmaps::navmap->new( |
(($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard') |
$ENV{"request.course.fn"}.".db", |
|| ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories')); |
$ENV{"request.course.fn"}."_parms.db", 1, 0); |
my $notshowSPRSlink = |
|
(($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external') |
if (!defined($navmap)) { |
|| ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')); |
my $requrl = $r->uri; |
my $notshowTotals= |
$ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed."; |
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'; |
return HTTP_NOT_ACCEPTABLE; |
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}) |
|
); |
|
|
|
&startGradeScreen($r,'quick'); |
|
|
|
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('<p><span class="LC_warning">'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'</span></p>'); |
|
$stdid=''; |
|
} |
|
$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).'<br />'. |
|
'<input type="submit" name="display" value="'.&mt('Update Display').'" /></p>'); |
|
if (($uname) && ($udom)) { |
|
$r->print('<p>'.&mt('Full Name: [_1]',&Apache::loncommon::plainname($uname,$udom)).'</p>'); |
|
} |
} |
} |
|
$r->rflush(); |
|
|
|
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); |
|
} |
|
if ($cangrade) { $r->print("\n</form>\n"); } |
|
&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".'<ul class="LC_TabContentBigger" id="main">'); |
|
$r->print("\n".'<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b> '. |
|
($showPoints?&mt('Individual Points Overview'):($showCategories?&mt('Grades Overview'):&mt('Completion Overview'))). |
|
' </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 (Detailed)').'</b></a></li>'); |
|
} |
|
if ($allowed_to_view) { |
|
$r->print("\n".'<li'.($mode eq 'statistics'?' class="active"':'').'><a href="/adm/statistics"><b>'. |
|
&mt('Statistics and Reports').'</b></a></li>'); |
|
|
|
$r->print("\n".'<li'.($mode eq 'chart'?' class="active"':'').'><a href="/adm/statistics?reportSelected=student_assessment"><b>'. |
|
&mt('Assessment Overview Chart').'</b></a></li>'); |
|
|
|
} |
|
if ($allowed_to_edit) { |
|
$r->print("\n".'<li'.($mode eq 'grading'?' class="active"':'').'><a href="/adm/grades"><b> '. |
|
&mt('Content Grading').' </b></a></li>'); |
|
if ($env{'form.symb'}) { |
|
$r->print("\n".'<li'.($mode eq 'probgrading'?' class="active"':'').'><a href="/adm/grades?symb='. |
|
&Apache::lonhtmlcommon::entity_encode($env{'form.symb'}). |
|
'&command=gradingmenu"><b> '. |
|
&mt('Problem Grading').' </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;">'); |
|
} |
|
|
|
sub endGradeScreen { |
|
my ($r)=@_; |
|
$r->print('</div></div></div>'.&Apache::loncommon::end_page()); |
|
} |
|
|
# Keep this hash in sync with %statusIconMap in lonnavmaps; they |
|
# should match color/icon |
|
my $res = $navmap->firstResource(); # temp resource to access constants |
|
|
|
# Header |
|
$r->print(&Apache::loncommon::bodytag('Quick Score Display','', |
|
'')); |
|
|
|
$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 |
|
|
|
$navmap->init(); |
sub getData { |
|
|
# End navmap using boilerplate |
my ($showPoints,$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 $iterator = $navmap->getIterator(undef, undef, undef, 1); |
my $depth = 1; |
my $depth = 1; |
Line 105 HEADER
|
Line 218 HEADER
|
# maps in order, with their data. |
# maps in order, with their data. |
# (If in the future people decide not to be cumulative, only add |
# (If in the future people decide not to be cumulative, only add |
# the counts to the parent map.) |
# the counts to the parent map.) |
|
# For convenience, "totalParts" is also "totalPoints" when we're looking |
|
# at points; I can't come up with a variable name that makes sense |
|
# equally for both cases. |
|
|
my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0; |
my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0; |
|
my $totalAttempted = 0; |
my $now = time(); |
my $now = time(); |
my $topLevelParts = 0; my $topLevelRight = 0; |
my $topLevelParts = 0; my $topLevelRight = 0; my $topLevelAttempted = 0; |
|
|
# Pre-run: Count parts correct |
# Pre-run: Count parts correct |
while ( $depth > 0 ) { |
while ( $depth > 0 ) { |
Line 119 HEADER
|
Line 236 HEADER
|
{ |
{ |
# Get number of correct, incorrect parts |
# Get number of correct, incorrect parts |
my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
$totalParts += $curRes->countParts(); |
|
my $partsRight = 0; |
my $partsRight = 0; |
|
my $partsCount = 0; |
|
my $partsAttempted = 0; |
my $stack = $iterator->getStack(); |
my $stack = $iterator->getStack(); |
|
|
for my $part (@{$parts}) { |
for my $part (@{$parts}) { |
my $status = $curRes->getCompletionStatus($part); |
my $completionStatus = $curRes->getCompletionStatus($part); |
my $thisright = 0; |
my $dateStatus = $curRes->getDateStatus($part); |
if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE |
|
|| $status == $curRes->EXCUSED || $status == $curRes->ANSWER_SUBMITTED) { |
if ($completionStatus == $curRes->EXCUSED()) { |
$partsRight++; |
next; |
$totalRight++; |
|
$thisright = 1; |
|
} |
|
|
|
my $dateStatus = $curRes->getDateStatus($part); |
|
if ($curRes->opendate($part) < $now) { |
|
$totalPossible++; |
|
} |
} |
|
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')) && |
|
($dateStatus != $curRes->ANSWER_OPEN)) { |
|
my $status = $curRes->simpleStatus($part); |
|
if ($status == $curRes->ATTEMPTED) { |
|
$partsAttempted += $curRes->weight($part); |
|
$totalAttempted += $partsAttempted; |
|
} |
|
} else { |
|
$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part)); |
|
} |
|
$partsRight += $score; |
|
$totalRight += $score; |
|
$partsCount += $curRes->weight($part); |
|
|
|
$curRes->{DATA}->{PROB_SCORE} += $score; |
|
$curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part); |
|
|
|
if ($curRes->opendate($part) < $now) { |
|
$totalPossible += $curRes->weight($part); |
|
$curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part); |
|
} |
|
$totalParts += $curRes->weight($part); |
|
} else { |
|
my $status = $curRes->simpleStatus($part); |
|
my $thisright = 0; |
|
$partsCount++; |
|
if ($status == $curRes->CORRECT || |
|
$status == $curRes->PARTIALLY_CORRECT ) { |
|
$partsRight++; |
|
$totalRight++; |
|
$thisright = 1; |
|
} |
|
|
|
if ($status == $curRes->ATTEMPTED) { |
|
$partsAttempted++; |
|
$totalAttempted++; |
|
} |
|
|
|
my $dateStatus = $curRes->getDateStatus($part); |
|
$totalParts++; |
|
if ($curRes->opendate($part) < $now) { |
|
$totalPossible++; |
|
} |
|
} |
} |
} |
|
|
if ($depth == 1) { # in top-level only |
if ($depth == 1) { # in top-level only |
$topLevelParts += scalar(@{$parts}); |
$topLevelParts += $partsCount; |
$topLevelRight += $partsRight; |
$topLevelRight += $partsRight; |
$r->print($curRes->compTitle() . '<br>'); |
$topLevelAttempted += $partsAttempted; |
} |
} |
|
|
# Crawl down stack and record parts correct and total |
# Crawl down stack and record parts correct and total |
Line 151 HEADER
|
Line 311 HEADER
|
if (!defined($res->{DATA}->{CHILD_PARTS})) { |
if (!defined($res->{DATA}->{CHILD_PARTS})) { |
$res->{DATA}->{CHILD_PARTS} = 0; |
$res->{DATA}->{CHILD_PARTS} = 0; |
$res->{DATA}->{CHILD_CORRECT} = 0; |
$res->{DATA}->{CHILD_CORRECT} = 0; |
|
$res->{DATA}->{CHILD_ATTEMPTED} = 0; |
} |
} |
|
|
$res->{DATA}->{CHILD_PARTS} += scalar(@{$parts}); |
$res->{DATA}->{CHILD_PARTS} += $partsCount; |
$res->{DATA}->{CHILD_CORRECT} += $partsRight; |
$res->{DATA}->{CHILD_CORRECT} += $partsRight; |
|
$res->{DATA}->{CHILD_ATTEMPTED} += $partsAttempted; |
} |
} |
} |
} |
} |
} |
$curRes = $iterator->next(); |
$curRes = $iterator->next(); |
} |
} |
|
return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted); |
|
} |
|
|
$iterator = $navmap->getIterator(undef, undef, undef, 1); |
# |
$depth = 1; |
# Outputting everything. |
$iterator->next(); # ignore first BEGIN_MAP |
# |
$curRes = $iterator->next(); |
|
|
sub outputTable { |
|
|
|
my ($r,$showPoints,$notshowTotals, |
|
$navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_; |
|
|
my @start = (255, 255, 192); |
my @start = (255, 255, 192); |
my @end = (0, 192, 0); |
my @end = (0, 192, 0); |
Line 172 HEADER
|
Line 340 HEADER
|
my $indentString = ' '; |
my $indentString = ' '; |
|
|
# Second pass: Print the maps. |
# Second pass: Print the maps. |
$r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Sequence</b></td>'); |
$r->print(&Apache::loncommon::start_data_table() |
$r->print('<td align="center">Done / Total</td><tr>' . "\n\n"); |
.&Apache::loncommon::start_data_table_header_row() |
|
.'<th>'.&mt('Folder').'</th>'); |
|
my $title = &mt($showPoints ? "Points Scored" : "Done"); |
|
if ($totalAttempted) { |
|
$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) { |
while ($depth > 0) { |
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} |
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} |
if ($curRes == $iterator->END_MAP()) { $depth--; } |
if ($curRes == $iterator->END_MAP()) { $depth--; } |
Line 183 HEADER
|
Line 367 HEADER
|
|
|
my $correct = $curRes->{DATA}->{CHILD_CORRECT}; |
my $correct = $curRes->{DATA}->{CHILD_CORRECT}; |
my $total = $curRes->{DATA}->{CHILD_PARTS}; |
my $total = $curRes->{DATA}->{CHILD_PARTS}; |
|
my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED}; |
|
|
if ($total > 0) { |
if ($total > 0) { |
my $ratio; |
my $ratio; |
$ratio = $correct / $total; |
$ratio = $correct / $total; |
my $color = mixColors(\@start, \@end, $ratio); |
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.';">'); |
|
|
my $thisIndent = ''; |
my $thisIndent = ''; |
for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; } |
for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; } |
|
|
$r->print("$thisIndent$title</td>"); |
$r->print("$thisIndent$title</td>"); |
$r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n"); |
if ($totalAttempted) { |
|
$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 |
|
.'<span class="LC_nobreak">' |
|
.$correct.($notshowTotals?'':' / '.$total) |
|
.'</span></td>' |
|
.&Apache::loncommon::end_data_table_row()); |
|
} |
} |
} |
} |
} |
|
|
Line 204 HEADER
|
Line 405 HEADER
|
# If there were any problems at the top level, print an extra "catchall" |
# If there were any problems at the top level, print an extra "catchall" |
if ($topLevelParts > 0) { |
if ($topLevelParts > 0) { |
my $ratio = $topLevelRight / $topLevelParts; |
my $ratio = $topLevelRight / $topLevelParts; |
my $color = mixColors(\@start, \@end, $ratio); |
my $color = &mixColors(\@start, \@end, $ratio); |
$r->print("<tr><td bgcolor='$color'>"); |
$r->print(&Apache::loncommon::start_data_table_row() |
$r->print("Problems Not Contained In A Folder</td><td>"); |
.'<td style="background-color:'.$color.';">'); |
$r->print("$topLevelRight / $topLevelParts</td></tr>"); |
$r->print(&mt("Problems Not Contained In A Folder")."</td><td>"); |
|
$r->print("$topLevelRight / $topLevelParts</td>" |
|
.&Apache::loncommon::end_data_table_row()); |
} |
} |
|
|
my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct"); |
# |
|
# show totals (if applicable), close table |
|
# |
|
if ($showPoints) { |
|
my $maxHelpLink = &Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct"); |
|
|
$r->print("<tr><td colspan='2' align='right'>Total Parts Done: <b>$totalRight</b><br>"); |
$title = $showPoints ? "Points" : "Parts Done"; |
$r->print("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>"); |
my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done"); |
$r->print("Total Parts In Course: <b>$totalParts</b></td></tr>\n\n"); |
$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(&Apache::loncommon::end_data_table()); |
|
} |
|
|
$r->print("</table></body></html>"); |
# |
|
# === 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 |
|
# |
|
|
$navmap->untieHashes(); |
sub outputCategories { |
|
|
return OK; |
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 '') || ($env{'form.cmd'} ne ''))) { |
|
# Process the changes |
|
%categories=&process_category_edits($r,$cangrade,%categories); |
|
# Actually store |
|
&Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum); |
|
} |
|
# new categories loaded now |
|
&output_category_table($r,$cangrade,$navmap,%categories); |
|
# |
|
if ($cangrade) { |
|
$r->print(&Apache::loncommon::resourcebrowser_javascript(). |
|
'<input type="hidden" name="storemove" value="" />'. |
|
'<input type="hidden" name="cmd" value="" />'. |
|
'<input type="hidden" name="resourcesymb" value="" />'. |
|
'<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'. |
|
'<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>'); |
|
} |
|
# |
|
# Debug |
|
# |
|
# my %data=&dumpdata($navmap); |
|
# foreach (keys(%data)) { |
|
# $r->print("\n<br />".$_.'='.$data{$_}); |
|
# } |
|
# my @debugarray=('5:1','4:3','1:1','5:5','6:7'); |
|
# $r->print("Array: ".join(',',@debugarray).'<br />'); |
|
# $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).'<br />'); |
|
# $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).'<br />'); |
|
# $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).'<br />'); |
|
# $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).'<br />'); |
|
# $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).'<br />'); |
|
# $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).'<br />'); |
|
# $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).'<br />'); |
|
# $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).'<br />'); |
|
# $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).'<br />'); |
|
# $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).'<br />'); |
|
# $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).'<br />'); |
|
# $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).'<br />'); |
|
# $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).'<br />'); |
|
# |
|
# $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).'<br />'); |
|
# $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).'<br />'); |
|
# $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).'<br />'); |
|
# $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).'<br />'); |
|
|
|
} |
|
|
|
# |
|
# Get data for all symbs |
|
# |
|
|
|
sub dumpdata { |
|
my ($navmap)=@_; |
|
my %returndata=(); |
|
|
|
# Run through the map and get all data |
|
|
|
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--; } |
|
if (ref($curRes)) { |
|
if ($curRes->is_map()) { |
|
$returndata{$curRes->symb()}='folder:'.$curRes->{DATA}->{CHILD_PARTS}.':'.$curRes->{DATA}->{CHILD_ATTEMPTED}.':'.$curRes->{DATA}->{CHILD_CORRECT}; |
|
} else { |
|
$returndata{$curRes->symb()}='res:'.$curRes->{DATA}->{PROB_WEIGHT}.':'.$curRes->{DATA}->{PROB_POSSIBLE}.':'.$curRes->{DATA}->{PROB_SCORE}; |
|
} |
|
} |
|
$curRes = $iterator->next(); |
|
} |
|
return %returndata; |
|
} |
|
|
|
# |
|
# Process editing commands, update category hash |
|
# |
|
|
|
sub process_category_edits { |
|
my ($r,$cangrade,%categories)=@_; |
|
unless ($cangrade) { return %categories; } |
|
# First store everything |
|
foreach my $id (split(/\,/,$categories{'order'})) { |
|
# Set names, types, and weight (there is only one of each per category) |
|
%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); |
|
%categories=&set_category_displayachieved($cangrade,$id,$env{'form.displayachieved_'.$id},%categories); |
|
# Set values for category rules (before names may change) |
|
%categories=&set_category_rules($cangrade,$id,%categories); |
|
} |
|
|
|
# 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); |
|
} elsif ($cmd=~/^addcont\_(.+)$/) { |
|
%categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories); |
|
} elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) { |
|
%categories=&del_category_content($1,$cangrade,$2,%categories); |
|
} elsif ($cmd=~/^newrule\_(.+)$/) { |
|
%categories=&add_calculation_rule($1,$cangrade,':',%categories); |
|
} elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) { |
|
%categories=&del_calculation_rule($1,$cangrade,$2,%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; |
|
} |
|
|
|
# |
|
# 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 %performance=&dumpdata($navmaps); |
|
my $maxpos=$#order; |
|
for (my $i=0;$i<=$maxpos;$i++) { |
|
my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%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('<th colspan="2">'.&mt("Move").'</th><th>'.&mt('Action').'</th>'); |
|
} |
|
$r->print('<th>'.&mt('Category').'</th>'. |
|
'<th>'.&mt('Contents').'</th>'. |
|
'<th>'.&mt('Total Points').'</th>'. |
|
'<th>'.&mt('Calculation').'</th>'. |
|
'<th>'.&mt('Relative Weight').'</th>'. |
|
'<th>'.&mt('Achieved').'</th>'); |
|
$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,$performance,$output,%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'); |
|
if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); } |
|
|
|
if ($output && $cangrade) { |
|
$r->print(<<ENDMOVE); |
|
<td> |
|
<div class="LC_docs_entry_move"> |
|
<a href='javascript:storecmd("up_$id");'> |
|
<img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /> |
|
</a> |
|
</div> |
|
<div class="LC_docs_entry_move"> |
|
<a href='javascript:storecmd("down_$id");'> |
|
<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /> |
|
</a> |
|
</div> |
|
</td> |
|
ENDMOVE |
|
$r->print("\n<td>\n<select name='newpos_$id' onchange='this.form.storemove.value=\"$id\";this.form.submit()'>"); |
|
for (my $i=0;$i<=$maxpos;$i++) { |
|
if ($i==$currentpos) { |
|
$r->print('<option value="" selected="selected">('.$i.')</option>'); |
|
} else { |
|
$r->print('<option value="'.$i.'">'.$i.'</option>'); |
|
} |
|
} |
|
$r->print("\n</select>\n</td>\n"); |
|
$r->print('<td><a href="javascript:storecmd(\'delcat_'.$id.'\');">'.&mt('Delete').'</a></td>'); |
|
$r->print('<td><input type="text" name="name_'.$id. |
|
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>'); |
|
} elsif ($output) { |
|
$r->print('<td>'.$categories{$id.'_name'}.'</td>'); |
|
} |
|
# Content display and summing up of points |
|
my $totalpossible=0; |
|
my $totalcorrect=0; |
|
my @individual=(); |
|
if ($output) { $r->print('<td><ul>'); } |
|
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) { |
|
my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid}); |
|
$totalpossible+=$possible; |
|
$totalcorrect+=$correct; |
|
if ($possible>0) { push(@individual,"$possible:$correct"); } |
|
if ($output) { |
|
$r->print('<li>'); |
|
$r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')'); |
|
if ($cangrade) { |
|
$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>'); |
|
} |
|
$r->print('</li>'); |
|
} |
|
} |
|
if ($output) { |
|
$r->print('</ul>'); |
|
if ($cangrade) { |
|
$r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />'); |
|
} |
|
$r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
|
$r->print('</td>'); |
|
} |
|
# Total |
|
if ($output) { $r->print('<td>'); } |
|
if ($cangrade) { |
|
if ($output) { |
|
$r->print( |
|
'<select name="totaltype_'.$id.'">'. |
|
'<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'. |
|
'<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'. |
|
'</select>'. |
|
'<input type="text" size="4" name="total_'.$id. |
|
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" />'); |
|
} |
|
} else { |
|
if ($output) { |
|
$r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'})); |
|
} |
|
} |
|
# Adjust total points |
|
if ($categories{$id.'_totaltype'} eq 'typein') { |
|
$totalpossible=1.*$categories{$id.'_total'}; |
|
} |
|
if ($output) { |
|
$r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
|
} |
|
|
|
|
|
# Calculation |
|
if ($output) { $r->print('<td><ul>'); } |
|
foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) { |
|
if ($output) { $r->print('<li>'); } |
|
my ($code,$value)=split(/\:/,$calcrule); |
|
if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); } |
|
if ($cangrade) { |
|
if ($output) { $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); } |
|
} |
|
if ($code eq 'capabove') { |
|
if ($totalpossible>0) { |
|
if ($totalcorrect/$totalpossible>$value/100.) { |
|
$totalcorrect=$totalpossible*$value/100.; |
|
} |
|
} |
|
} elsif ($code eq 'capbelow') { |
|
if ($totalpossible>0) { |
|
if ($totalcorrect/$totalpossible<$value/100.) { |
|
$totalcorrect=$totalpossible*$value/100.; |
|
} |
|
} |
|
} elsif ($code eq 'droplow') { |
|
($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual); |
|
} elsif ($code eq 'drophigh') { |
|
($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual); |
|
} elsif ($code eq 'droplowperc') { |
|
($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual); |
|
} elsif ($code eq 'drophighperc') { |
|
($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual); |
|
} |
|
if ($output) { $r->print('</li>'); } |
|
} |
|
# Re-adjust total points if force total |
|
if ($categories{$id.'_totaltype'} eq 'typein') { |
|
$totalpossible=1.*$categories{$id.'_total'}; |
|
} |
|
|
|
if ($output) { |
|
$r->print('</ul>'); |
|
if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); } |
|
$r->print('<p>'.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>'); |
|
$r->print('</td>'); |
|
} |
|
|
|
# Weight |
|
if ($cangrade) { |
|
if ($output) { |
|
$r->print('<td>'. |
|
'<input type="text" size="4" name="weight_'.$id. |
|
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>'); |
|
} |
|
} else { |
|
if ($output) { |
|
$r->print('<td>'.$categories{$id.'_weight'}.'</td>'); |
|
} |
|
} |
|
# Achieved |
|
if ($output) { $r->print('<td>'); } |
|
if ($cangrade) { |
|
if ($output) { |
|
$r->print('<select name="displayachieved_'.$id.'">'. |
|
'<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'. |
|
'<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'. |
|
'</select>'); |
|
} |
|
} else { |
|
if ($output) { |
|
if ($categories{$id.'_displayachieved'} eq 'percent') { |
|
$r->print(&mt('percent')); |
|
} else { |
|
$r->print(&mt('points')); |
|
} |
|
} |
|
} |
|
if ($output) { $r->print('</td>'); } |
|
|
|
return ($value,$weight); |
|
} |
|
|
|
# |
|
# Drop folders and problems |
|
# |
|
|
|
sub drop { |
|
my ($high,$percent,$n,@individual)=@_; |
|
# Sort assignments by points or percent |
|
my @newindividual=sort { |
|
my ($pa,$ca)=split(/\:/,$a); |
|
my ($pb,$cb)=split(/\:/,$b); |
|
if ($percent) { |
|
my $perca=0; |
|
if ($pa>0) { $perca=$ca/$pa; } |
|
my $percb=0; |
|
if ($pb>0) { $percb=$cb/$pb; } |
|
$perca<=>$percb; |
|
} else { |
|
$ca<=>$cb; |
|
} |
|
} @individual; |
|
# Drop the ones we don't want |
|
if ($#newindividual>=$n) { |
|
if ($high) { |
|
splice(@newindividual,$#newindividual+1-$n,$n); |
|
} else { |
|
splice(@newindividual,0,$n); |
|
} |
|
} else { |
|
@newindividual=(); |
|
} |
|
# Re-calculate how many points possible and achieved |
|
my $newpossible=0; |
|
my $newcorrect=0; |
|
for my $score (@newindividual) { |
|
my ($thispossible,$thiscorrect)=(split(/\:/,$score)); |
|
$newpossible+=$thispossible; |
|
$newcorrect+=$thiscorrect; |
|
} |
|
return ($newpossible,$newcorrect,@newindividual); |
|
} |
|
# |
|
# Bottom line with grades |
|
# |
|
|
|
sub bottom_line_category { |
|
my ($r,$cangrade,$sum,$total)=@_; |
|
$r->print(&Apache::loncommon::start_data_table_row()); |
|
if ($cangrade) { |
|
$r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>'); |
|
} |
|
$r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>'); |
|
} |
|
|
|
# |
|
# 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.'_weight'}=0; |
|
$categories{$id.'_totaltype'}='default'; |
|
$categories{$id.'_displayachieved'}='percent'; |
|
return %categories; |
|
} |
|
|
|
|
|
# === Calculation Rule Editing |
|
|
|
sub category_rule_codes { |
|
return &Apache::lonlocal::texthash( |
|
'droplowperc' => 'Drop N lowest grade percentage problems/folders', |
|
'drophighperc' => 'Drop N highest grade percentage problems/folderss', |
|
'droplow' => 'Drop N lowest point problems/folders', |
|
'drophigh' => 'Drop N highest point problems/folders', |
|
'capabove' => 'Cap percentage above N percent', |
|
'capbelow' => 'Cap percentage below N percent'); |
|
} |
|
|
|
sub pretty_prt_rule { |
|
my ($cangrade,$id,$code,$value)=@_; |
|
my $cid=$id.'_'.$code; |
|
my %lt=&category_rule_codes(); |
|
my $ret='<span class="LC_nobreak">'; |
|
if ($cangrade) { |
|
$ret.='<select name="sel_'.$cid.'">'; |
|
foreach my $calc (''=>'',sort(keys(%lt))) { |
|
$ret.='<option value="'.$calc.'"'.($calc eq $code?' selected="selected"':'').' />'.$lt{$calc}.'</input>'; |
|
} |
|
$ret.='</select> N=<input type="text" size="5" name="val_'.$cid.'" value="'.$value.'" /></span>'; |
|
} else { |
|
$ret.=$lt{$code}.'; N='.$value; |
|
} |
|
$ret.='</span>'; |
|
return $ret; |
|
} |
|
|
|
sub new_calc_rule_form { |
|
my ($id)=@_; |
|
return '<a href="javascript:storecmd(\'newrule_'.$id.'\');">'.&mt('New Calculation Rule').'</a>'; |
|
} |
|
|
|
# |
|
# 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; |
|
} |
|
|
|
sub set_category_rules { |
|
my ($cangrade,$id,%categories)=@_; |
|
unless ($cangrade) { return %categories; } |
|
my %lt=&category_rule_codes(); |
|
my @newrules=(); |
|
foreach my $code ('',(keys(%lt))) { |
|
if ($env{'form.sel_'.$id.'_'.$code}) { |
|
push(@newrules,$env{'form.sel_'.$id.'_'.$code}.':'.$env{'form.val_'.$id.'_'.$code}); |
|
} |
|
} |
|
$categories{$id.'_calculations'}=join(',',sort(@newrules)); |
|
return %categories; |
|
} |
|
|
|
|
|
# === Category Editing |
|
|
|
# |
|
# Add to category content |
|
# |
|
|
|
sub add_category_content { |
|
my ($id,$cangrade,$newcontent,%categories)=@_; |
|
unless ($cangrade) { return %categories; } |
|
&Apache::lonnet::logthis("In here $newcontent"); |
|
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)=@_; |
|
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); |
|
} |
|
|
|
# |
|
# 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 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; |
|
} |
|
|
|
sub set_category_displayachieved { |
|
my ($cangrade,$id,$value,%categories)=@_; |
|
unless ($cangrade) { return %categories; } |
|
unless (($value eq 'percent') || ($value eq 'points')) { $value='percent'; } |
|
$categories{$id.'_displayachieved'}=$value; |
|
return %categories; |
|
} |
|
|
|
|
|
# |
|
# === end category-related |
|
# |
|
# |
# Pass this two refs to arrays for the start and end color, and a number |
# 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 |
# from 0 to 1 for how much of the latter you want to mix in. It will |
# return a string ready to show ("#FFC309"); |
# return a string ready to show ("#FFC309"); |
|
|
sub mixColors { |
sub mixColors { |
my $start = shift; |
my $start = shift; |
my $end = shift; |
my $end = shift; |