@@ -628,80 +640,100 @@ ENDMOVE
$r->print('
'.&mt('Delete').' | ');
$r->print('
| ');
- } else {
+ } elsif ($output) {
$r->print('
'.$categories{$id.'_name'}.' | ');
}
-# Content
- $r->print('
');
+# Content display and summing up of points
+ my $totalpossible=0;
+ my $totalcorrect=0;
+ if ($output) { $r->print(''); }
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
- $r->print('- ');
- $r->print(&Apache::lonnet::gettitle($contentid));
- if ($cangrade) {
- $r->print(' '.&mt('Delete').'');
- }
- $r->print('
');
- }
- $r->print(' ');
- if ($cangrade) {
- $r->print(' '.&mt('Add Problem or Folder').' '.
- &Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();'));
+ my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
+ $totalpossible+=$possible;
+ $totalcorrect+=$correct;
+ if ($output) {
+ $r->print('- ');
+ $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');
+ if ($cangrade) {
+ $r->print(' '.&mt('Delete').'');
+ }
+ $r->print('
');
+ }
+ }
+ if ($output) {
+ $r->print('');
+ $r->print(''.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).' ');
+ if ($cangrade) {
+ $r->print(' '.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).' ');
+ }
+ $r->print(' | ');
}
- $r->print(' | ');
-
# Total
if ($cangrade) {
- $r->print('
'.
+ if ($output) {
+ $r->print(' | '.
''.
' | ');
+ '" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" />');
+ }
} else {
- $r->print('
'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).' | ');
+ if ($output) {
+ $r->print('
'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).' | ');
+ }
}
# Calculation
- $r->print('
');
+ if ($output) { $r->print(''); }
foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
- $r->print('- ');
+ if ($output) { $r->print('
- '); }
my ($code,$value)=split(/\:/,$calcrule);
- $r->print(&pretty_prt_rule($cangrade,$id,$code,$value));
+ if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); }
if ($cangrade) {
- $r->print(' '.&mt('Delete').'');
+ if ($output) { $r->print(' '.&mt('Delete').''); }
}
- $r->print('
');
+ if ($output) { $r->print(''); }
}
- $r->print(' ');
+ if ($output) { $r->print(''); }
if ($cangrade) {
- $r->print(' '.&new_calc_rule_form($id));
+ if ($output) { $r->print(' '.&new_calc_rule_form($id)); }
}
- $r->print(' | ');
+ if ($output) { $r->print(' | '); }
# Weight
if ($cangrade) {
- $r->print('
'.
+ if ($output) {
+ $r->print(' | '.
' | ');
+ }
} else {
- $r->print('
'.$categories{$id.'_weight'}.' | ');
+ if ($output) {
+ $r->print('
'.$categories{$id.'_weight'}.' | ');
+ }
}
# Achieved
- $r->print('
');
+ if ($output) { $r->print(' | '); }
if ($cangrade) {
- $r->print(' | ');
+ if ($output) { $r->print(''); }
return ($value,$weight);
}
@@ -834,6 +866,7 @@ sub set_category_rules {
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;