@@ -576,43 +640,108 @@ ENDMOVE
$r->print('
'.&mt('Delete').' | ');
$r->print('
| ');
- } else {
+ } elsif ($output) {
$r->print('
'.$categories{$id.'_name'}.' | ');
}
-# Content
-# FIXME: just placeholders
- if ($cangrade) {
- $r->print("
Content Edit | ");
- } else {
- $r->print("
Content | ");
+# Content display and summing up of points
+ my $totalpossible=0;
+ my $totalcorrect=0;
+ if ($output) { $r->print('
'); }
+ foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
+ 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('
');
+ }
}
-# Calculation
-# FIXME: just placeholders
- if ($cangrade) {
- $r->print("Calculation Edit | ");
- } else {
- $r->print("Calculation | ");
+ 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(' | ');
}
# Total
+ if ($output) { $r->print('
'); }
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'}));
+ }
+ }
+# Adjust total points
+ if ($categories{$id.'_totaltype'} eq 'typein') {
+ $totalpossible=1.*$categories{$id.'_total'};
+ }
+ if ($output) {
+ $r->print(' '.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).' ');
+ }
+
+
+# Calculation
+ if ($output) { $r->print(' | '); }
+ foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
+ if ($output) { $r->print('- '); }
+ my ($code,$value)=split(/\:/,$calcrule);
+ if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); }
+ if ($cangrade) {
+ if ($output) { $r->print(' '.&mt('Delete').''); }
+ }
+ if ($output) { $r->print('
'); }
}
+ if ($output) { $r->print(' '); }
+ if ($cangrade) {
+ if ($output) { $r->print('
'.&new_calc_rule_form($id)); }
+ }
+ 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
+ if ($output) { $r->print('
'); }
+ if ($cangrade) {
+ if ($output) {
+ $r->print('');
+ }
+ } else {
+ if ($output) {
+ if ($categories{$id.'_displayachieved'} eq 'percent') {
+ $r->print(&mt('percent'));
+ } else {
+ $r->print(&mt('points'));
+ }
+ }
+ }
+ if ($output) { $r->print(' | '); }
return ($value,$weight);
}
@@ -627,7 +756,7 @@ sub bottom_line_category {
if ($cangrade) {
$r->print('
'.&mt('Create New Category').' | ');
}
- $r->print('
'.&mt('Current:').$sum.'
'.&mt('Total:').$total.'
| ');
+ $r->print('
'.&mt('Current:').$sum.'
'.&mt('Total:').$total.'
| ');
}
#
@@ -651,6 +780,123 @@ sub make_new_category {
}
$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(
+ 'droplow' => 'Drop N lowest grade assignments',
+ 'drophigh' => 'Drop N highest grade assignments',
+ '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='
';
+ if ($cangrade) {
+ $ret.=' N=';
+ } else {
+ $ret.=$lt{$code}.'; N='.$value;
+ }
+ $ret.='';
+ return $ret;
+}
+
+sub new_calc_rule_form {
+ my ($id)=@_;
+ return '
'.&mt('New Calculation Rule').'';
+}
+
+#
+# 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;
}
@@ -659,15 +905,16 @@ sub make_new_category {
#
sub del_category {
- my ($id,$cangrade,%categories)=@_;
- my @neworder=();
- foreach my $currentid (split(/\,/,$categories{'order'})) {
- unless ($currentid eq $id) {
- push(@neworder,$currentid);
- }
- }
- $categories{'order'}=join(',',@neworder);
- return %categories;
+ 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;
}
#
@@ -780,6 +1027,15 @@ sub set_category_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
#