version 1.82, 2011/03/26 22:37:47
|
version 1.88, 2011/05/22 21:53:52
|
Line 62 sub real_handler {
|
Line 62 sub real_handler {
|
$r->send_http_header; |
$r->send_http_header; |
|
|
my $showPoints = |
my $showPoints = |
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard'; |
(($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard') |
|
|| ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories')); |
my $notshowSPRSlink = |
my $notshowSPRSlink = |
(($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external') |
(($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 'externalnototals')); |
Line 266 sub getData {
|
Line 267 sub getData {
|
$totalRight += $score; |
$totalRight += $score; |
$partsCount += $curRes->weight($part); |
$partsCount += $curRes->weight($part); |
|
|
|
$curRes->{DATA}->{PROB_SCORE} += $score; |
|
$curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part); |
|
|
if ($curRes->opendate($part) < $now) { |
if ($curRes->opendate($part) < $now) { |
$totalPossible += $curRes->weight($part); |
$totalPossible += $curRes->weight($part); |
|
$curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part); |
} |
} |
$totalParts += $curRes->weight($part); |
$totalParts += $curRes->weight($part); |
} else { |
} else { |
Line 459 sub outputCategories {
|
Line 464 sub outputCategories {
|
&output_category_table($r,$cangrade,$navmap,%categories); |
&output_category_table($r,$cangrade,$navmap,%categories); |
# |
# |
if ($cangrade) { |
if ($cangrade) { |
$r->print('<input type="hidden" name="storemove" value="" />'. |
$r->print(&Apache::loncommon::resourcebrowser_javascript(). |
|
'<input type="hidden" name="storemove" value="" />'. |
'<input type="hidden" name="cmd" 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").'" />'. |
'<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>'); |
'<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>'); |
} |
} |
Line 470 sub outputCategories {
|
Line 477 sub outputCategories {
|
# my %data=&dumpdata($navmap); |
# my %data=&dumpdata($navmap); |
# foreach (keys(%data)) { |
# foreach (keys(%data)) { |
# $r->print("\n<br />".$_.'='.$data{$_}); |
# $r->print("\n<br />".$_.'='.$data{$_}); |
# } |
# } |
} |
} |
|
|
# |
# |
Line 491 sub dumpdata {
|
Line 498 sub dumpdata {
|
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--; } |
if (ref($curRes) && $curRes->is_map()) { |
if (ref($curRes)) { |
$returndata{$curRes->symb()}=$curRes->{DATA}->{CHILD_PARTS}.':'.$curRes->{DATA}->{CHILD_ATTEMPTED}.':'.$curRes->{DATA}->{CHILD_CORRECT}; |
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(); |
$curRes = $iterator->next(); |
} |
} |
Line 528 sub process_category_edits {
|
Line 539 sub process_category_edits {
|
} elsif ($cmd=~/^delcat\_(.+)$/) { |
} elsif ($cmd=~/^delcat\_(.+)$/) { |
%categories=&del_category($1,$cangrade,%categories); |
%categories=&del_category($1,$cangrade,%categories); |
} elsif ($cmd=~/^addcont\_(.+)$/) { |
} elsif ($cmd=~/^addcont\_(.+)$/) { |
%categories=&add_category_content($1,$cangrade,$env{'form.addcont_'.$1.'_symb'},%categories); |
%categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories); |
} elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) { |
} elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) { |
%categories=&del_category_content($1,$cangrade,$2,%categories); |
%categories=&del_category_content($1,$cangrade,$2,%categories); |
} elsif ($cmd=~/^newrule\_(.+)$/) { |
} elsif ($cmd=~/^newrule\_(.+)$/) { |
Line 558 sub output_category_table {
|
Line 569 sub output_category_table {
|
# |
# |
my @order=split(/\,/,$categories{'order'}); |
my @order=split(/\,/,$categories{'order'}); |
# |
# |
|
my %performance=&dumpdata($navmaps); |
my $maxpos=$#order; |
my $maxpos=$#order; |
for (my $i=0;$i<=$maxpos;$i++) { |
for (my $i=0;$i<=$maxpos;$i++) { |
my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,%categories); |
my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,%categories); |
$sum+=$value*$weight; |
$sum+=$value*$weight; |
$total+=$weight; |
$total+=$weight; |
} |
} |
Line 592 sub output_category_table_header {
|
Line 604 sub output_category_table_header {
|
# |
# |
|
|
sub output_and_calc_category { |
sub output_and_calc_category { |
my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,%categories)=@_; |
my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,%categories)=@_; |
my $value=0; |
my $value=0; |
my $weight=0; |
my $weight=0; |
my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); |
my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); |
Line 635 ENDMOVE
|
Line 647 ENDMOVE
|
$r->print('<td><ul>'); |
$r->print('<td><ul>'); |
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) { |
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) { |
$r->print('<li>'); |
$r->print('<li>'); |
$r->print(&Apache::lonnet::gettitle($contentid)); |
$r->print(&Apache::lonnet::gettitle($contentid).' '.$$performance{$contentid}); |
if ($cangrade) { |
if ($cangrade) { |
$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>'); |
$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>'); |
} |
} |
Line 643 ENDMOVE
|
Line 655 ENDMOVE
|
} |
} |
$r->print('</ul>'); |
$r->print('</ul>'); |
if ($cangrade) { |
if ($cangrade) { |
$r->print('<br />'.&mt('Add Problem or Folder').'<br />'. |
$r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />'); |
&Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();')); |
|
} |
} |
$r->print('</td>'); |
$r->print('</td>'); |
|
|
Line 834 sub set_category_rules {
|
Line 845 sub set_category_rules {
|
sub add_category_content { |
sub add_category_content { |
my ($id,$cangrade,$newcontent,%categories)=@_; |
my ($id,$cangrade,$newcontent,%categories)=@_; |
unless ($cangrade) { return %categories; } |
unless ($cangrade) { return %categories; } |
|
&Apache::lonnet::logthis("In here $newcontent"); |
my %newcontent=($newcontent => 1); |
my %newcontent=($newcontent => 1); |
foreach my $current (split(/\,/,$categories{$id.'_content'})) { |
foreach my $current (split(/\,/,$categories{$id.'_content'})) { |
$newcontent{$current}=1; |
$newcontent{$current}=1; |