--- loncom/homework/grades.pm 2007/05/20 21:10:46 1.400
+++ loncom/homework/grades.pm 2007/06/13 15:22:38 1.402
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.400 2007/05/20 21:10:46 www Exp $
+# $Id: grades.pm,v 1.402 2007/06/13 15:22:38 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -180,7 +180,7 @@ sub showResourceInfo {
if (exists($partsseen{$partID})) {
$result.="
";
} else {
- $result.="
";
+ $result.="
";
}
$partsseen{$partID}=1;
}
@@ -708,16 +708,16 @@ LISTJAVASCRIPT
&commonJSfunctions($request);
$request->print($result);
- my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
- my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
+ my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
+ my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
my $gradeTable=''."\n";
return $result;
}
@@ -6156,6 +6155,28 @@ sub gather_clicker_ids {
return %clickerids;
}
+sub gather_adv_clicker_ids {
+ my %clickerids=();
+ my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+ my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+ foreach my $element (sort keys %coursepersonnel) {
+ foreach my $person (split(/\,/,$coursepersonnel{$element})) {
+ my ($puname,$pudom)=split(/\:/,$person);
+ my $clickers =
+ (&Apache::lonnet::userenvironment($pudom,$puname,'clickers'))[1];
+ foreach my $id (split(/\,/,$clickers)) {
+ if (exists($clickerids{$id})) {
+ $clickerids{$id}.=','.$puname.':'.$pudom;
+ } else {
+ $clickerids{$id}=$puname.':'.$pudom;
+ }
+ }
+ }
+ }
+ return %clickerids;
+}
+
sub process_clicker {
my ($r)=@_;
my ($symb)=&get_symb($r);
@@ -6171,10 +6192,54 @@ sub process_clicker {
$result.='
'."\n";
my $upload=&mt("Upload File");
my $type=&mt("Type");
+ my $attendance=&mt("Award points just for participation");
+ my $personnel=&mt("Correctness determined from response by course personnel");
+ my $specific=&mt("Correctness determind from response with clicker ID");
+ my $pcorrect=&mt("Percentage points for correct solution");
+ my $pincorrect=&mt("Percentage points for incorrect solution");
my $selectform=&Apache::loncommon::select_form('iclicker','upfiletype',
('iclicker' => 'iClicker'));
$result.=<
+function sanitycheck() {
+// Accept only integer percentages
+ document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);
+ document.forms.gradesupload.pincorrect.value=Math.round(document.forms.gradesupload.pincorrect.value);
+// Find out grading choice
+ for (i=0; i
ENDUPFORM